From 4d118442fc0314b1f00f917d167a96fec1168372 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Sun, 1 Sep 2024 09:10:24 +0200 Subject: [PATCH 01/45] API: Update to COMET v7.2.1 --- demo/api/.prettierignore | 3 +- demo/api/package.json | 6 +- packages/api/package.json | 11 +- pnpm-lock.yaml | 1295 +++++++++++++++++++++++++++++++++++-- 4 files changed, 1246 insertions(+), 69 deletions(-) diff --git a/demo/api/.prettierignore b/demo/api/.prettierignore index fe35c774..c0d3410f 100644 --- a/demo/api/.prettierignore +++ b/demo/api/.prettierignore @@ -1,2 +1,3 @@ dist/ -block-meta.json \ No newline at end of file +block-meta.json +uploads \ No newline at end of file diff --git a/demo/api/package.json b/demo/api/package.json index 218f7de1..a02e3b4e 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -51,9 +51,9 @@ "dependencies": { "@aws-sdk/client-s3": "^3.49.0", "@azure/storage-blob": "^12.0.0", - "@comet/blocks-api": "^6.8.0", + "@comet/blocks-api": "^7.2.1", "@comet/brevo-api": "workspace:*", - "@comet/cms-api": "^6.8.0", + "@comet/cms-api": "^7.2.1", "@faker-js/faker": "^8.3.1", "@hapi/accept": "^5.0.0", "@kubernetes/client-node": "^0.18.0", @@ -102,7 +102,7 @@ "webpack": "^5.64.2" }, "devDependencies": { - "@comet/eslint-config": "^6.8.0", + "@comet/eslint-config": "^7.2.1", "@nestjs/cli": "^9.0.0", "@nestjs/schematics": "^9.0.0", "@nestjs/testing": "^9.0.0", diff --git a/packages/api/package.json b/packages/api/package.json index 9971673e..f3ca5c22 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -20,6 +20,7 @@ "generate-schema:watch": "chokidar \"src/\" -c \"$npm_execpath generate-schema\"", "lint": "run-p lint:eslint lint:tsc", "lint:eslint": "eslint --max-warnings 0 src/ package.json", + "lint:prettier": "npx prettier --check './**/*.{js,json,md,yml,yaml}'", "lint:tsc": "tsc --noEmit", "test": "jest", "test:watch": "jest --watch" @@ -37,9 +38,9 @@ "devDependencies": { "@aws-sdk/client-s3": "^3.47.0", "@azure/storage-blob": "^12.0.0", - "@comet/blocks-api": "^6.8.0", - "@comet/cms-api": "^6.8.0", - "@comet/eslint-config": "^6.8.0", + "@comet/blocks-api": "^7.2.1", + "@comet/cms-api": "^7.2.1", + "@comet/eslint-config": "^7.2.1", "@kubernetes/client-node": "^0.18.0", "@mikro-orm/cli": "^5.7.1", "@mikro-orm/core": "^5.0.5", @@ -76,8 +77,8 @@ "uuid": "^8.3.2" }, "peerDependencies": { - "@comet/blocks-api": "^6.0.0", - "@comet/cms-api": "^6.0.0", + "@comet/blocks-api": "^7.2.1", + "@comet/cms-api": "^7.2.1", "@mikro-orm/cli": "^5.7.1", "@mikro-orm/core": "^5.0.5", "@mikro-orm/migrations": "^5.7.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dc1d22fa..c7ee383b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -286,14 +286,14 @@ importers: specifier: ^12.0.0 version: 12.17.0 '@comet/blocks-api': - specifier: ^6.8.0 - version: 6.8.0(@nestjs/common@9.4.3)(class-transformer@0.5.1)(class-validator@0.13.2) + specifier: ^7.2.1 + version: 7.2.1(@nestjs/common@9.4.3) '@comet/brevo-api': specifier: workspace:* version: link:../../packages/api '@comet/cms-api': - specifier: ^6.8.0 - version: 6.8.0(@aws-sdk/client-s3@3.490.0)(@azure/storage-blob@12.17.0)(@kubernetes/client-node@0.18.1)(@mikro-orm/cli@5.9.7)(@mikro-orm/core@5.9.7)(@mikro-orm/migrations@5.9.7)(@mikro-orm/nestjs@5.2.3)(@mikro-orm/postgresql@5.9.7)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/graphql@10.2.1)(class-transformer@0.5.1)(express@4.18.2)(graphql@15.8.0)(nestjs-console@8.0.0)(pg-error-constants@1.0.0)(rxjs@7.8.1) + specifier: ^7.2.1 + version: 7.2.1(@kubernetes/client-node@0.18.1)(@mikro-orm/core@5.9.7)(@mikro-orm/migrations@5.9.7)(@mikro-orm/nestjs@5.2.3)(@mikro-orm/postgresql@5.9.7)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/graphql@10.2.1)(@nestjs/platform-express@9.4.3)(express@4.18.2)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) '@faker-js/faker': specifier: ^8.3.1 version: 8.3.1 @@ -434,8 +434,8 @@ importers: version: 5.89.0(webpack-cli@4.10.0) devDependencies: '@comet/eslint-config': - specifier: ^6.8.0 - version: 6.8.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@27.1.5)(typescript@4.9.5) + specifier: ^7.2.1 + version: 7.2.1(eslint@8.56.0)(prettier@2.8.8)(ts-jest@27.1.5)(typescript@4.9.5) '@nestjs/cli': specifier: ^9.0.0 version: 9.5.0 @@ -969,14 +969,14 @@ importers: specifier: ^12.0.0 version: 12.17.0 '@comet/blocks-api': - specifier: ^6.8.0 - version: 6.8.0(@nestjs/common@9.4.3)(class-transformer@0.5.1)(class-validator@0.13.2) + specifier: ^7.2.1 + version: 7.2.1(@nestjs/common@9.4.3) '@comet/cms-api': - specifier: ^6.8.0 - version: 6.8.0(@aws-sdk/client-s3@3.490.0)(@azure/storage-blob@12.17.0)(@kubernetes/client-node@0.18.1)(@mikro-orm/cli@5.9.7)(@mikro-orm/core@5.9.7)(@mikro-orm/migrations@5.9.7)(@mikro-orm/nestjs@5.2.3)(@mikro-orm/postgresql@5.9.7)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/graphql@10.2.1)(class-transformer@0.5.1)(express@4.18.2)(graphql@15.8.0)(nestjs-console@8.0.0)(pg-error-constants@1.0.0)(rxjs@7.8.1) + specifier: ^7.2.1 + version: 7.2.1(@kubernetes/client-node@0.18.1)(@mikro-orm/core@5.9.7)(@mikro-orm/migrations@5.9.7)(@mikro-orm/nestjs@5.2.3)(@mikro-orm/postgresql@5.9.7)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/graphql@10.2.1)(@nestjs/platform-express@9.4.3)(express@4.18.2)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) '@comet/eslint-config': - specifier: ^6.8.0 - version: 6.8.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@29.1.1)(typescript@4.9.5) + specifier: ^7.2.1 + version: 7.2.1(eslint@8.56.0)(prettier@2.8.8)(ts-jest@29.1.1)(typescript@4.9.5) '@kubernetes/client-node': specifier: ^0.18.0 version: 0.18.1 @@ -1356,6 +1356,14 @@ packages: '@aws-sdk/types': 3.489.0 tslib: 1.14.1 + /@aws-crypto/crc32@5.2.0: + resolution: {integrity: sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-crypto/util': 5.2.0 + '@aws-sdk/types': 3.609.0 + tslib: 2.6.2 + /@aws-crypto/crc32c@3.0.0: resolution: {integrity: sha512-ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w==} dependencies: @@ -1363,6 +1371,13 @@ packages: '@aws-sdk/types': 3.489.0 tslib: 1.14.1 + /@aws-crypto/crc32c@5.2.0: + resolution: {integrity: sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==} + dependencies: + '@aws-crypto/util': 5.2.0 + '@aws-sdk/types': 3.609.0 + tslib: 2.6.2 + /@aws-crypto/ie11-detection@3.0.0: resolution: {integrity: sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==} dependencies: @@ -1379,6 +1394,16 @@ packages: '@aws-sdk/util-utf8-browser': 3.259.0 tslib: 1.14.1 + /@aws-crypto/sha1-browser@5.2.0: + resolution: {integrity: sha512-OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==} + dependencies: + '@aws-crypto/supports-web-crypto': 5.2.0 + '@aws-crypto/util': 5.2.0 + '@aws-sdk/types': 3.609.0 + '@aws-sdk/util-locate-window': 3.465.0 + '@smithy/util-utf8': 2.0.2 + tslib: 2.6.2 + /@aws-crypto/sha256-browser@3.0.0: resolution: {integrity: sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==} dependencies: @@ -1391,6 +1416,17 @@ packages: '@aws-sdk/util-utf8-browser': 3.259.0 tslib: 1.14.1 + /@aws-crypto/sha256-browser@5.2.0: + resolution: {integrity: sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==} + dependencies: + '@aws-crypto/sha256-js': 5.2.0 + '@aws-crypto/supports-web-crypto': 5.2.0 + '@aws-crypto/util': 5.2.0 + '@aws-sdk/types': 3.609.0 + '@aws-sdk/util-locate-window': 3.465.0 + '@smithy/util-utf8': 2.0.2 + tslib: 2.6.2 + /@aws-crypto/sha256-js@3.0.0: resolution: {integrity: sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==} dependencies: @@ -1398,11 +1434,24 @@ packages: '@aws-sdk/types': 3.489.0 tslib: 1.14.1 + /@aws-crypto/sha256-js@5.2.0: + resolution: {integrity: sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-crypto/util': 5.2.0 + '@aws-sdk/types': 3.609.0 + tslib: 2.6.2 + /@aws-crypto/supports-web-crypto@3.0.0: resolution: {integrity: sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==} dependencies: tslib: 1.14.1 + /@aws-crypto/supports-web-crypto@5.2.0: + resolution: {integrity: sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==} + dependencies: + tslib: 2.6.2 + /@aws-crypto/util@3.0.0: resolution: {integrity: sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==} dependencies: @@ -1410,6 +1459,13 @@ packages: '@aws-sdk/util-utf8-browser': 3.259.0 tslib: 1.14.1 + /@aws-crypto/util@5.2.0: + resolution: {integrity: sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==} + dependencies: + '@aws-sdk/types': 3.609.0 + '@smithy/util-utf8': 2.0.2 + tslib: 2.6.2 + /@aws-sdk/client-s3@3.490.0: resolution: {integrity: sha512-fBj3CJ3+5R+l/sc93Z9mKw8gM2b9K6vEhC9qSCG2XNymLd9YqlRft1peQ7VymrWywAHX3Koz1GCUrFEVNONiMw==} engines: {node: '>=14.0.0'} @@ -1475,6 +1531,120 @@ packages: transitivePeerDependencies: - aws-crt + /@aws-sdk/client-s3@3.637.0: + resolution: {integrity: sha512-y6UC94fsMvhKbf0dzfnjVP1HePeGjplfcYfilZU1COIJLyTkMcUv4XcT4I407CGIrvgEafONHkiC09ygqUauNA==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-crypto/sha1-browser': 5.2.0 + '@aws-crypto/sha256-browser': 5.2.0 + '@aws-crypto/sha256-js': 5.2.0 + '@aws-sdk/client-sso-oidc': 3.637.0(@aws-sdk/client-sts@3.637.0) + '@aws-sdk/client-sts': 3.637.0 + '@aws-sdk/core': 3.635.0 + '@aws-sdk/credential-provider-node': 3.637.0(@aws-sdk/client-sso-oidc@3.637.0)(@aws-sdk/client-sts@3.637.0) + '@aws-sdk/middleware-bucket-endpoint': 3.620.0 + '@aws-sdk/middleware-expect-continue': 3.620.0 + '@aws-sdk/middleware-flexible-checksums': 3.620.0 + '@aws-sdk/middleware-host-header': 3.620.0 + '@aws-sdk/middleware-location-constraint': 3.609.0 + '@aws-sdk/middleware-logger': 3.609.0 + '@aws-sdk/middleware-recursion-detection': 3.620.0 + '@aws-sdk/middleware-sdk-s3': 3.635.0 + '@aws-sdk/middleware-ssec': 3.609.0 + '@aws-sdk/middleware-user-agent': 3.637.0 + '@aws-sdk/region-config-resolver': 3.614.0 + '@aws-sdk/signature-v4-multi-region': 3.635.0 + '@aws-sdk/types': 3.609.0 + '@aws-sdk/util-endpoints': 3.637.0 + '@aws-sdk/util-user-agent-browser': 3.609.0 + '@aws-sdk/util-user-agent-node': 3.614.0 + '@aws-sdk/xml-builder': 3.609.0 + '@smithy/config-resolver': 3.0.5 + '@smithy/core': 2.4.0 + '@smithy/eventstream-serde-browser': 3.0.6 + '@smithy/eventstream-serde-config-resolver': 3.0.3 + '@smithy/eventstream-serde-node': 3.0.5 + '@smithy/fetch-http-handler': 3.2.4 + '@smithy/hash-blob-browser': 3.1.2 + '@smithy/hash-node': 3.0.3 + '@smithy/hash-stream-node': 3.1.2 + '@smithy/invalid-dependency': 3.0.3 + '@smithy/md5-js': 3.0.3 + '@smithy/middleware-content-length': 3.0.5 + '@smithy/middleware-endpoint': 3.1.0 + '@smithy/middleware-retry': 3.0.15 + '@smithy/middleware-serde': 3.0.3 + '@smithy/middleware-stack': 3.0.3 + '@smithy/node-config-provider': 3.1.4 + '@smithy/node-http-handler': 3.1.4 + '@smithy/protocol-http': 4.1.0 + '@smithy/smithy-client': 3.2.0 + '@smithy/types': 3.3.0 + '@smithy/url-parser': 3.0.3 + '@smithy/util-base64': 3.0.0 + '@smithy/util-body-length-browser': 3.0.0 + '@smithy/util-body-length-node': 3.0.0 + '@smithy/util-defaults-mode-browser': 3.0.15 + '@smithy/util-defaults-mode-node': 3.0.15 + '@smithy/util-endpoints': 2.0.5 + '@smithy/util-middleware': 3.0.3 + '@smithy/util-retry': 3.0.3 + '@smithy/util-stream': 3.1.3 + '@smithy/util-utf8': 3.0.0 + '@smithy/util-waiter': 3.1.2 + tslib: 2.6.2 + transitivePeerDependencies: + - aws-crt + + /@aws-sdk/client-sso-oidc@3.637.0(@aws-sdk/client-sts@3.637.0): + resolution: {integrity: sha512-27bHALN6Qb6m6KZmPvRieJ/QRlj1lyac/GT2Rn5kJpre8Mpp+yxrtvp3h9PjNBty4lCeFEENfY4dGNSozBuBcw==} + engines: {node: '>=16.0.0'} + peerDependencies: + '@aws-sdk/client-sts': ^3.637.0 + dependencies: + '@aws-crypto/sha256-browser': 5.2.0 + '@aws-crypto/sha256-js': 5.2.0 + '@aws-sdk/client-sts': 3.637.0 + '@aws-sdk/core': 3.635.0 + '@aws-sdk/credential-provider-node': 3.637.0(@aws-sdk/client-sso-oidc@3.637.0)(@aws-sdk/client-sts@3.637.0) + '@aws-sdk/middleware-host-header': 3.620.0 + '@aws-sdk/middleware-logger': 3.609.0 + '@aws-sdk/middleware-recursion-detection': 3.620.0 + '@aws-sdk/middleware-user-agent': 3.637.0 + '@aws-sdk/region-config-resolver': 3.614.0 + '@aws-sdk/types': 3.609.0 + '@aws-sdk/util-endpoints': 3.637.0 + '@aws-sdk/util-user-agent-browser': 3.609.0 + '@aws-sdk/util-user-agent-node': 3.614.0 + '@smithy/config-resolver': 3.0.5 + '@smithy/core': 2.4.0 + '@smithy/fetch-http-handler': 3.2.4 + '@smithy/hash-node': 3.0.3 + '@smithy/invalid-dependency': 3.0.3 + '@smithy/middleware-content-length': 3.0.5 + '@smithy/middleware-endpoint': 3.1.0 + '@smithy/middleware-retry': 3.0.15 + '@smithy/middleware-serde': 3.0.3 + '@smithy/middleware-stack': 3.0.3 + '@smithy/node-config-provider': 3.1.4 + '@smithy/node-http-handler': 3.1.4 + '@smithy/protocol-http': 4.1.0 + '@smithy/smithy-client': 3.2.0 + '@smithy/types': 3.3.0 + '@smithy/url-parser': 3.0.3 + '@smithy/util-base64': 3.0.0 + '@smithy/util-body-length-browser': 3.0.0 + '@smithy/util-body-length-node': 3.0.0 + '@smithy/util-defaults-mode-browser': 3.0.15 + '@smithy/util-defaults-mode-node': 3.0.15 + '@smithy/util-endpoints': 2.0.5 + '@smithy/util-middleware': 3.0.3 + '@smithy/util-retry': 3.0.3 + '@smithy/util-utf8': 3.0.0 + tslib: 2.6.2 + transitivePeerDependencies: + - aws-crt + /@aws-sdk/client-sso@3.490.0: resolution: {integrity: sha512-yfxoHmCL1w/IKmFRfzCxdVCQrGlSQf4eei9iVEm5oi3iE8REFyPj3o/BmKQEHG3h2ITK5UbdYDb5TY4xoYHsyA==} engines: {node: '>=14.0.0'} @@ -1519,6 +1689,51 @@ packages: transitivePeerDependencies: - aws-crt + /@aws-sdk/client-sso@3.637.0: + resolution: {integrity: sha512-+KjLvgX5yJYROWo3TQuwBJlHCY0zz9PsLuEolmXQn0BVK1L/m9GteZHtd+rEdAoDGBpE0Xqjy1oz5+SmtsaRUw==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-crypto/sha256-browser': 5.2.0 + '@aws-crypto/sha256-js': 5.2.0 + '@aws-sdk/core': 3.635.0 + '@aws-sdk/middleware-host-header': 3.620.0 + '@aws-sdk/middleware-logger': 3.609.0 + '@aws-sdk/middleware-recursion-detection': 3.620.0 + '@aws-sdk/middleware-user-agent': 3.637.0 + '@aws-sdk/region-config-resolver': 3.614.0 + '@aws-sdk/types': 3.609.0 + '@aws-sdk/util-endpoints': 3.637.0 + '@aws-sdk/util-user-agent-browser': 3.609.0 + '@aws-sdk/util-user-agent-node': 3.614.0 + '@smithy/config-resolver': 3.0.5 + '@smithy/core': 2.4.0 + '@smithy/fetch-http-handler': 3.2.4 + '@smithy/hash-node': 3.0.3 + '@smithy/invalid-dependency': 3.0.3 + '@smithy/middleware-content-length': 3.0.5 + '@smithy/middleware-endpoint': 3.1.0 + '@smithy/middleware-retry': 3.0.15 + '@smithy/middleware-serde': 3.0.3 + '@smithy/middleware-stack': 3.0.3 + '@smithy/node-config-provider': 3.1.4 + '@smithy/node-http-handler': 3.1.4 + '@smithy/protocol-http': 4.1.0 + '@smithy/smithy-client': 3.2.0 + '@smithy/types': 3.3.0 + '@smithy/url-parser': 3.0.3 + '@smithy/util-base64': 3.0.0 + '@smithy/util-body-length-browser': 3.0.0 + '@smithy/util-body-length-node': 3.0.0 + '@smithy/util-defaults-mode-browser': 3.0.15 + '@smithy/util-defaults-mode-node': 3.0.15 + '@smithy/util-endpoints': 2.0.5 + '@smithy/util-middleware': 3.0.3 + '@smithy/util-retry': 3.0.3 + '@smithy/util-utf8': 3.0.0 + tslib: 2.6.2 + transitivePeerDependencies: + - aws-crt + /@aws-sdk/client-sts@3.490.0: resolution: {integrity: sha512-n2vQ5Qu2qi2I0XMI+IH99ElpIRHOJTa1+sqNC4juMYxKQBMvw+EnsqUtaL3QvTHoyxNB/R7mpkeBB6SzPQ1TtA==} engines: {node: '>=14.0.0'} @@ -1566,6 +1781,53 @@ packages: transitivePeerDependencies: - aws-crt + /@aws-sdk/client-sts@3.637.0: + resolution: {integrity: sha512-xUi7x4qDubtA8QREtlblPuAcn91GS/09YVEY/RwU7xCY0aqGuFwgszAANlha4OUIqva8oVj2WO4gJuG+iaSnhw==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-crypto/sha256-browser': 5.2.0 + '@aws-crypto/sha256-js': 5.2.0 + '@aws-sdk/client-sso-oidc': 3.637.0(@aws-sdk/client-sts@3.637.0) + '@aws-sdk/core': 3.635.0 + '@aws-sdk/credential-provider-node': 3.637.0(@aws-sdk/client-sso-oidc@3.637.0)(@aws-sdk/client-sts@3.637.0) + '@aws-sdk/middleware-host-header': 3.620.0 + '@aws-sdk/middleware-logger': 3.609.0 + '@aws-sdk/middleware-recursion-detection': 3.620.0 + '@aws-sdk/middleware-user-agent': 3.637.0 + '@aws-sdk/region-config-resolver': 3.614.0 + '@aws-sdk/types': 3.609.0 + '@aws-sdk/util-endpoints': 3.637.0 + '@aws-sdk/util-user-agent-browser': 3.609.0 + '@aws-sdk/util-user-agent-node': 3.614.0 + '@smithy/config-resolver': 3.0.5 + '@smithy/core': 2.4.0 + '@smithy/fetch-http-handler': 3.2.4 + '@smithy/hash-node': 3.0.3 + '@smithy/invalid-dependency': 3.0.3 + '@smithy/middleware-content-length': 3.0.5 + '@smithy/middleware-endpoint': 3.1.0 + '@smithy/middleware-retry': 3.0.15 + '@smithy/middleware-serde': 3.0.3 + '@smithy/middleware-stack': 3.0.3 + '@smithy/node-config-provider': 3.1.4 + '@smithy/node-http-handler': 3.1.4 + '@smithy/protocol-http': 4.1.0 + '@smithy/smithy-client': 3.2.0 + '@smithy/types': 3.3.0 + '@smithy/url-parser': 3.0.3 + '@smithy/util-base64': 3.0.0 + '@smithy/util-body-length-browser': 3.0.0 + '@smithy/util-body-length-node': 3.0.0 + '@smithy/util-defaults-mode-browser': 3.0.15 + '@smithy/util-defaults-mode-node': 3.0.15 + '@smithy/util-endpoints': 2.0.5 + '@smithy/util-middleware': 3.0.3 + '@smithy/util-retry': 3.0.3 + '@smithy/util-utf8': 3.0.0 + tslib: 2.6.2 + transitivePeerDependencies: + - aws-crt + /@aws-sdk/core@3.490.0: resolution: {integrity: sha512-TSBWkXtxMU7q1Zo6w3v5wIOr/sj7P5Jw3OyO7lJrFGsPsDC2xwpxkVqTesDxkzgMRypO52xjYEmveagn1xxBHg==} engines: {node: '>=14.0.0'} @@ -1577,6 +1839,21 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@aws-sdk/core@3.635.0: + resolution: {integrity: sha512-i1x/E/sgA+liUE1XJ7rj1dhyXpAKO1UKFUcTTHXok2ARjWTvszHnSXMOsB77aPbmn0fUp1JTx2kHUAZ1LVt5Bg==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/core': 2.4.0 + '@smithy/node-config-provider': 3.1.4 + '@smithy/property-provider': 3.1.3 + '@smithy/protocol-http': 4.1.0 + '@smithy/signature-v4': 4.1.0 + '@smithy/smithy-client': 3.2.0 + '@smithy/types': 3.3.0 + '@smithy/util-middleware': 3.0.3 + fast-xml-parser: 4.4.1 + tslib: 2.6.2 + /@aws-sdk/credential-provider-env@3.489.0: resolution: {integrity: sha512-5PqYsx9G5SB2tqPT9/z/u0EkF6D4wP6HTMWQs+DfMdmwXihrqQAgeYaTtV3KbXqb88p6sfacwxhUvE6+Rm494w==} engines: {node: '>=14.0.0'} @@ -1586,6 +1863,29 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@aws-sdk/credential-provider-env@3.620.1: + resolution: {integrity: sha512-ExuILJ2qLW5ZO+rgkNRj0xiAipKT16Rk77buvPP8csR7kkCflT/gXTyzRe/uzIiETTxM7tr8xuO9MP/DQXqkfg==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-sdk/types': 3.609.0 + '@smithy/property-provider': 3.1.3 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + + /@aws-sdk/credential-provider-http@3.635.0: + resolution: {integrity: sha512-iJyRgEjOCQlBMXqtwPLIKYc7Bsc6nqjrZybdMDenPDa+kmLg7xh8LxHsu9088e+2/wtLicE34FsJJIfzu3L82g==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-sdk/types': 3.609.0 + '@smithy/fetch-http-handler': 3.2.4 + '@smithy/node-http-handler': 3.1.4 + '@smithy/property-provider': 3.1.3 + '@smithy/protocol-http': 4.1.0 + '@smithy/smithy-client': 3.2.0 + '@smithy/types': 3.3.0 + '@smithy/util-stream': 3.1.3 + tslib: 2.6.2 + /@aws-sdk/credential-provider-ini@3.490.0: resolution: {integrity: sha512-7m63zyCpVqj9FsoDxWMWWRvL6c7zZzOcXYkHZmHujVVlmAXH0RT/vkXFkYgt+Ku+ov+v5NQrzwO5TmVoRt6O8g==} engines: {node: '>=14.0.0'} @@ -1603,6 +1903,28 @@ packages: transitivePeerDependencies: - aws-crt + /@aws-sdk/credential-provider-ini@3.637.0(@aws-sdk/client-sso-oidc@3.637.0)(@aws-sdk/client-sts@3.637.0): + resolution: {integrity: sha512-h+PFCWfZ0Q3Dx84SppET/TFpcQHmxFW8/oV9ArEvMilw4EBN+IlxgbL0CnHwjHW64szcmrM0mbebjEfHf4FXmw==} + engines: {node: '>=16.0.0'} + peerDependencies: + '@aws-sdk/client-sts': ^3.637.0 + dependencies: + '@aws-sdk/client-sts': 3.637.0 + '@aws-sdk/credential-provider-env': 3.620.1 + '@aws-sdk/credential-provider-http': 3.635.0 + '@aws-sdk/credential-provider-process': 3.620.1 + '@aws-sdk/credential-provider-sso': 3.637.0(@aws-sdk/client-sso-oidc@3.637.0) + '@aws-sdk/credential-provider-web-identity': 3.621.0(@aws-sdk/client-sts@3.637.0) + '@aws-sdk/types': 3.609.0 + '@smithy/credential-provider-imds': 3.2.0 + '@smithy/property-provider': 3.1.3 + '@smithy/shared-ini-file-loader': 3.1.4 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + transitivePeerDependencies: + - '@aws-sdk/client-sso-oidc' + - aws-crt + /@aws-sdk/credential-provider-node@3.490.0: resolution: {integrity: sha512-Gh33u2O5Xbout8G3z/Z5H/CZzdG1ophxf/XS3iMFxA1cazQ7swY1UMmGvB7Lm7upvax5anXouItD1Ph3gzKc4w==} engines: {node: '>=14.0.0'} @@ -1621,6 +1943,27 @@ packages: transitivePeerDependencies: - aws-crt + /@aws-sdk/credential-provider-node@3.637.0(@aws-sdk/client-sso-oidc@3.637.0)(@aws-sdk/client-sts@3.637.0): + resolution: {integrity: sha512-yoEhoxJJfs7sPVQ6Is939BDQJZpZCoUgKr/ySse4YKOZ24t4VqgHA6+wV7rYh+7IW24Rd91UTvEzSuHYTlxlNA==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-sdk/credential-provider-env': 3.620.1 + '@aws-sdk/credential-provider-http': 3.635.0 + '@aws-sdk/credential-provider-ini': 3.637.0(@aws-sdk/client-sso-oidc@3.637.0)(@aws-sdk/client-sts@3.637.0) + '@aws-sdk/credential-provider-process': 3.620.1 + '@aws-sdk/credential-provider-sso': 3.637.0(@aws-sdk/client-sso-oidc@3.637.0) + '@aws-sdk/credential-provider-web-identity': 3.621.0(@aws-sdk/client-sts@3.637.0) + '@aws-sdk/types': 3.609.0 + '@smithy/credential-provider-imds': 3.2.0 + '@smithy/property-provider': 3.1.3 + '@smithy/shared-ini-file-loader': 3.1.4 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + transitivePeerDependencies: + - '@aws-sdk/client-sso-oidc' + - '@aws-sdk/client-sts' + - aws-crt + /@aws-sdk/credential-provider-process@3.489.0: resolution: {integrity: sha512-3vKQYJZ5cZYjy0870CPmbmKRBgATw2xCygxhn4m4UDCjOXVXcGUtYD51DMWsvBo3S0W8kH+FIJV4yuEDMFqLFQ==} engines: {node: '>=14.0.0'} @@ -1631,6 +1974,16 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@aws-sdk/credential-provider-process@3.620.1: + resolution: {integrity: sha512-hWqFMidqLAkaV9G460+1at6qa9vySbjQKKc04p59OT7lZ5cO5VH5S4aI05e+m4j364MBROjjk2ugNvfNf/8ILg==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-sdk/types': 3.609.0 + '@smithy/property-provider': 3.1.3 + '@smithy/shared-ini-file-loader': 3.1.4 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@aws-sdk/credential-provider-sso@3.490.0: resolution: {integrity: sha512-3UUBUoPbFvT58IhS4Vb23omYj/QPNkjgxu9p9ruQ3KSjLkanI4w8t/l/jljA65q83P7CoLnM5UKG9L7RA8/V1Q==} engines: {node: '>=14.0.0'} @@ -1645,6 +1998,21 @@ packages: transitivePeerDependencies: - aws-crt + /@aws-sdk/credential-provider-sso@3.637.0(@aws-sdk/client-sso-oidc@3.637.0): + resolution: {integrity: sha512-Mvz+h+e62/tl+dVikLafhv+qkZJ9RUb8l2YN/LeKMWkxQylPT83CPk9aimVhCV89zth1zpREArl97+3xsfgQvA==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-sdk/client-sso': 3.637.0 + '@aws-sdk/token-providers': 3.614.0(@aws-sdk/client-sso-oidc@3.637.0) + '@aws-sdk/types': 3.609.0 + '@smithy/property-provider': 3.1.3 + '@smithy/shared-ini-file-loader': 3.1.4 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + transitivePeerDependencies: + - '@aws-sdk/client-sso-oidc' + - aws-crt + /@aws-sdk/credential-provider-web-identity@3.489.0: resolution: {integrity: sha512-mjIuE2Wg1H/ds0nXQ/7vfusEDudmdd8YzKZI1y5O4n60iZZtyB2RNIECtvLMx1EQAKclidY7/06qQkArrGau5Q==} engines: {node: '>=14.0.0'} @@ -1654,6 +2022,18 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@aws-sdk/credential-provider-web-identity@3.621.0(@aws-sdk/client-sts@3.637.0): + resolution: {integrity: sha512-w7ASSyfNvcx7+bYGep3VBgC3K6vEdLmlpjT7nSIHxxQf+WSdvy+HynwJosrpZax0sK5q0D1Jpn/5q+r5lwwW6w==} + engines: {node: '>=16.0.0'} + peerDependencies: + '@aws-sdk/client-sts': ^3.621.0 + dependencies: + '@aws-sdk/client-sts': 3.637.0 + '@aws-sdk/types': 3.609.0 + '@smithy/property-provider': 3.1.3 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@aws-sdk/middleware-bucket-endpoint@3.489.0: resolution: {integrity: sha512-6rJ5bpNMKo7sEKQ6p2DMbQwM+ahMYASRxfdyH7hs18blvlcS20H1RYpNmJMqPPjxMwUWruty2JPMIRl4DFcv8w==} engines: {node: '>=14.0.0'} @@ -1666,6 +2046,18 @@ packages: '@smithy/util-config-provider': 2.1.0 tslib: 2.6.2 + /@aws-sdk/middleware-bucket-endpoint@3.620.0: + resolution: {integrity: sha512-eGLL0W6L3HDb3OACyetZYOWpHJ+gLo0TehQKeQyy2G8vTYXqNTeqYhuI6up9HVjBzU9eQiULVQETmgQs7TFaRg==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-sdk/types': 3.609.0 + '@aws-sdk/util-arn-parser': 3.568.0 + '@smithy/node-config-provider': 3.1.4 + '@smithy/protocol-http': 4.1.0 + '@smithy/types': 3.3.0 + '@smithy/util-config-provider': 3.0.0 + tslib: 2.6.2 + /@aws-sdk/middleware-expect-continue@3.489.0: resolution: {integrity: sha512-2RZfnVZFaGHwzPDQJsyf9SXufu1gUd4VsMhm7dC7SWF85XmpDrozbFznS/tD22QdtyWjerLoydZJMq229hpPqg==} engines: {node: '>=14.0.0'} @@ -1675,6 +2067,15 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@aws-sdk/middleware-expect-continue@3.620.0: + resolution: {integrity: sha512-QXeRFMLfyQ31nAHLbiTLtk0oHzG9QLMaof5jIfqcUwnOkO8YnQdeqzakrg1Alpy/VQ7aqzIi8qypkBe2KXZz0A==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-sdk/types': 3.609.0 + '@smithy/protocol-http': 4.1.0 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@aws-sdk/middleware-flexible-checksums@3.489.0: resolution: {integrity: sha512-Cy3rBUMr4P7raxzrJFWNRshfKrKV2EojawaC9Bfk/T8aFlV+FmVrRg4ISAXMOfS5pfy3xfAbvkzjOaeqCsGfrA==} engines: {node: '>=14.0.0'} @@ -1688,6 +2089,19 @@ packages: '@smithy/util-utf8': 2.0.2 tslib: 2.6.2 + /@aws-sdk/middleware-flexible-checksums@3.620.0: + resolution: {integrity: sha512-ftz+NW7qka2sVuwnnO1IzBku5ccP+s5qZGeRTPgrKB7OzRW85gthvIo1vQR2w+OwHFk7WJbbhhWwbCbktnP4UA==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-crypto/crc32': 5.2.0 + '@aws-crypto/crc32c': 5.2.0 + '@aws-sdk/types': 3.609.0 + '@smithy/is-array-buffer': 3.0.0 + '@smithy/protocol-http': 4.1.0 + '@smithy/types': 3.3.0 + '@smithy/util-utf8': 3.0.0 + tslib: 2.6.2 + /@aws-sdk/middleware-host-header@3.489.0: resolution: {integrity: sha512-Cl7HJ1jhOfllwf0CRx1eB4ypRGMqdGKWpc0eSTXty7wWSvCdMZUhwfjQqu2bIOIlgYxg/gFu6TVmVZ6g4O8PlA==} engines: {node: '>=14.0.0'} @@ -1697,6 +2111,15 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@aws-sdk/middleware-host-header@3.620.0: + resolution: {integrity: sha512-VMtPEZwqYrII/oUkffYsNWY9PZ9xpNJpMgmyU0rlDQ25O1c0Hk3fJmZRe6pEkAJ0omD7kLrqGl1DUjQVxpd/Rg==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-sdk/types': 3.609.0 + '@smithy/protocol-http': 4.1.0 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@aws-sdk/middleware-location-constraint@3.489.0: resolution: {integrity: sha512-NIVr+kHR2N6gxFeE3TNw2mEBxgj0N9xXBLy3dNYMMlAUvQlT/0z9HlC9+3XqcTS/Z5ElF/+pei6nqXTVt0He9A==} engines: {node: '>=14.0.0'} @@ -1705,6 +2128,14 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@aws-sdk/middleware-location-constraint@3.609.0: + resolution: {integrity: sha512-xzsdoTkszGVqGVPjUmgoP7TORiByLueMHieI1fhQL888WPdqctwAx3ES6d/bA9Q/i8jnc6hs+Fjhy8UvBTkE9A==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-sdk/types': 3.609.0 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@aws-sdk/middleware-logger@3.489.0: resolution: {integrity: sha512-+EVDnWese61MdImcBNAgz/AhTcIZJaska/xsU3GWU9CP905x4a4qZdB7fExFMDu1Jlz5pJqNteFYYHCFMJhHfg==} engines: {node: '>=14.0.0'} @@ -1713,6 +2144,14 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@aws-sdk/middleware-logger@3.609.0: + resolution: {integrity: sha512-S62U2dy4jMDhDFDK5gZ4VxFdWzCtLzwbYyFZx2uvPYTECkepLUfzLic2BHg2Qvtu4QjX+oGE3P/7fwaGIsGNuQ==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-sdk/types': 3.609.0 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@aws-sdk/middleware-recursion-detection@3.489.0: resolution: {integrity: sha512-m4rU+fTzziQcu9DKjRNZ4nQlXENEd2ZnJblJV4ONdWqqEjbmOgOj3P6aCCQlJdIbzuNvX1FBOZ5tY59ZpERo7Q==} engines: {node: '>=14.0.0'} @@ -1722,6 +2161,15 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@aws-sdk/middleware-recursion-detection@3.620.0: + resolution: {integrity: sha512-nh91S7aGK3e/o1ck64sA/CyoFw+gAYj2BDOnoNa6ouyCrVJED96ZXWbhye/fz9SgmNUZR2g7GdVpiLpMKZoI5w==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-sdk/types': 3.609.0 + '@smithy/protocol-http': 4.1.0 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@aws-sdk/middleware-sdk-s3@3.489.0: resolution: {integrity: sha512-/GGASx7mK9qEgy1znvleYMZKVqm3sOdGghqKdy2zgoGcH2jH+fZrLM0lDMT9bvdITmOCbJJs2rVHP3xm/ZWcXg==} engines: {node: '>=14.0.0'} @@ -1736,6 +2184,25 @@ packages: '@smithy/util-config-provider': 2.1.0 tslib: 2.6.2 + /@aws-sdk/middleware-sdk-s3@3.635.0: + resolution: {integrity: sha512-RLdYJPEV4JL/7NBoFUs7VlP90X++5FlJdxHz0DzCjmiD3qCviKy+Cym3qg1gBgHwucs5XisuClxDrGokhAdTQw==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-sdk/core': 3.635.0 + '@aws-sdk/types': 3.609.0 + '@aws-sdk/util-arn-parser': 3.568.0 + '@smithy/core': 2.4.0 + '@smithy/node-config-provider': 3.1.4 + '@smithy/protocol-http': 4.1.0 + '@smithy/signature-v4': 4.1.0 + '@smithy/smithy-client': 3.2.0 + '@smithy/types': 3.3.0 + '@smithy/util-config-provider': 3.0.0 + '@smithy/util-middleware': 3.0.3 + '@smithy/util-stream': 3.1.3 + '@smithy/util-utf8': 3.0.0 + tslib: 2.6.2 + /@aws-sdk/middleware-signing@3.489.0: resolution: {integrity: sha512-rlHcWYZn6Ym3v/u0DvKNDiD7ogIzEsHlerm0lowTiQbszkFobOiUClRTALwvsUZdAAztl706qO1OKbnGnD6Ubw==} engines: {node: '>=14.0.0'} @@ -1756,6 +2223,14 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@aws-sdk/middleware-ssec@3.609.0: + resolution: {integrity: sha512-GZSD1s7+JswWOTamVap79QiDaIV7byJFssBW68GYjyRS5EBjNfwA/8s+6uE6g39R3ojyTbYOmvcANoZEhSULXg==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-sdk/types': 3.609.0 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@aws-sdk/middleware-user-agent@3.489.0: resolution: {integrity: sha512-M54Cv2fAN3GGgdfUjLtZ4wFUIrfM/ivbXv4DgpcNsacEQ2g4H+weQgKp41X7XZW8MWAzl+k1zJaryK69RYNQkQ==} engines: {node: '>=14.0.0'} @@ -1766,6 +2241,16 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@aws-sdk/middleware-user-agent@3.637.0: + resolution: {integrity: sha512-EYo0NE9/da/OY8STDsK2LvM4kNa79DBsf4YVtaG4P5pZ615IeFsD8xOHZeuJmUrSMlVQ8ywPRX7WMucUybsKug==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-sdk/types': 3.609.0 + '@aws-sdk/util-endpoints': 3.637.0 + '@smithy/protocol-http': 4.1.0 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@aws-sdk/region-config-resolver@3.489.0: resolution: {integrity: sha512-UvrnB78XTz9ddby7mr0vuUHn2MO3VTjzaIu+GQhyedMGQU0QlIQrYOlzbbu4LC5rL1O8FxFLUxRe/AAjgwyuGw==} engines: {node: '>=14.0.0'} @@ -1777,6 +2262,17 @@ packages: '@smithy/util-middleware': 2.0.9 tslib: 2.6.2 + /@aws-sdk/region-config-resolver@3.614.0: + resolution: {integrity: sha512-vDCeMXvic/LU0KFIUjpC3RiSTIkkvESsEfbVHiHH0YINfl8HnEqR5rj+L8+phsCeVg2+LmYwYxd5NRz4PHxt5g==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-sdk/types': 3.609.0 + '@smithy/node-config-provider': 3.1.4 + '@smithy/types': 3.3.0 + '@smithy/util-config-provider': 3.0.0 + '@smithy/util-middleware': 3.0.3 + tslib: 2.6.2 + /@aws-sdk/signature-v4-multi-region@3.489.0: resolution: {integrity: sha512-kYFM7Opu36EkFlzXdVNOBFpQApgnuaTu/U/qYhGyuzeD+HNnYgZEsd/tDro1DQ074jVy3GN9ttJSYxq5I4oTkA==} engines: {node: '>=14.0.0'} @@ -1788,6 +2284,17 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@aws-sdk/signature-v4-multi-region@3.635.0: + resolution: {integrity: sha512-J6QY4/invOkpogCHjSaDON1hF03viPpOnsrzVuCvJMmclS/iG62R4EY0wq1alYll0YmSdmKlpJwHMWwGtqK63Q==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-sdk/middleware-sdk-s3': 3.635.0 + '@aws-sdk/types': 3.609.0 + '@smithy/protocol-http': 4.1.0 + '@smithy/signature-v4': 4.1.0 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@aws-sdk/token-providers@3.489.0: resolution: {integrity: sha512-hSgjB8CMQoA8EIQ0ripDjDtbBcWDSa+7vSBYPIzksyknaGERR/GUfGXLV2dpm5t17FgFG6irT5f3ZlBzarL8Dw==} engines: {node: '>=14.0.0'} @@ -1832,6 +2339,19 @@ packages: transitivePeerDependencies: - aws-crt + /@aws-sdk/token-providers@3.614.0(@aws-sdk/client-sso-oidc@3.637.0): + resolution: {integrity: sha512-okItqyY6L9IHdxqs+Z116y5/nda7rHxLvROxtAJdLavWTYDydxrZstImNgGWTeVdmc0xX2gJCI77UYUTQWnhRw==} + engines: {node: '>=16.0.0'} + peerDependencies: + '@aws-sdk/client-sso-oidc': ^3.614.0 + dependencies: + '@aws-sdk/client-sso-oidc': 3.637.0(@aws-sdk/client-sts@3.637.0) + '@aws-sdk/types': 3.609.0 + '@smithy/property-provider': 3.1.3 + '@smithy/shared-ini-file-loader': 3.1.4 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@aws-sdk/types@3.489.0: resolution: {integrity: sha512-kcDtLfKog/p0tC4gAeqJqWxAiEzfe2LRPnKamvSG2Mjbthx4R/alE2dxyIq/wW+nvRv0fqR3OD5kD1+eVfdr/w==} engines: {node: '>=14.0.0'} @@ -1839,12 +2359,25 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@aws-sdk/types@3.609.0: + resolution: {integrity: sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@aws-sdk/util-arn-parser@3.465.0: resolution: {integrity: sha512-zOJ82vzDJFqBX9yZBlNeHHrul/kpx/DCoxzW5UBbZeb26kfV53QhMSoEmY8/lEbBqlqargJ/sgRC845GFhHNQw==} engines: {node: '>=14.0.0'} dependencies: tslib: 2.6.2 + /@aws-sdk/util-arn-parser@3.568.0: + resolution: {integrity: sha512-XUKJWWo+KOB7fbnPP0+g/o5Ulku/X53t7i/h+sPHr5xxYTJJ9CYnbToo95mzxe7xWvkLrsNtJ8L+MnNn9INs2w==} + engines: {node: '>=16.0.0'} + dependencies: + tslib: 2.6.2 + /@aws-sdk/util-endpoints@3.489.0: resolution: {integrity: sha512-uGyG1u84ATX03mf7bT4xD9XD/vlYJGD5+RxMN/UpzeTfzXfh+jvCQWbOQ44z8ttFJWYQQqrLxkfpF/JgvALzLA==} engines: {node: '>=14.0.0'} @@ -1854,6 +2387,15 @@ packages: '@smithy/util-endpoints': 1.0.8 tslib: 2.6.2 + /@aws-sdk/util-endpoints@3.637.0: + resolution: {integrity: sha512-pAqOKUHeVWHEXXDIp/qoMk/6jyxIb6GGjnK1/f8dKHtKIEs4tKsnnL563gceEvdad53OPXIt86uoevCcCzmBnw==} + engines: {node: '>=16.0.0'} + dependencies: + '@aws-sdk/types': 3.609.0 + '@smithy/types': 3.3.0 + '@smithy/util-endpoints': 2.0.5 + tslib: 2.6.2 + /@aws-sdk/util-locate-window@3.465.0: resolution: {integrity: sha512-f+QNcWGswredzC1ExNAB/QzODlxwaTdXkNT5cvke2RLX8SFU5pYk6h4uCtWC0vWPELzOfMfloBrJefBzlarhsw==} engines: {node: '>=14.0.0'} @@ -1868,6 +2410,14 @@ packages: bowser: 2.11.0 tslib: 2.6.2 + /@aws-sdk/util-user-agent-browser@3.609.0: + resolution: {integrity: sha512-fojPU+mNahzQ0YHYBsx0ZIhmMA96H+ZIZ665ObU9tl+SGdbLneVZVikGve+NmHTQwHzwkFsZYYnVKAkreJLAtA==} + dependencies: + '@aws-sdk/types': 3.609.0 + '@smithy/types': 3.3.0 + bowser: 2.11.0 + tslib: 2.6.2 + /@aws-sdk/util-user-agent-node@3.489.0: resolution: {integrity: sha512-CYdkBHig8sFNc0dv11Ni9WXvZQHeI5+z77OrDHKkbidFx/V4BDTuwZw4K1vWg62pzFOEfzunJFiULRcDZWJR3w==} engines: {node: '>=14.0.0'} @@ -1882,6 +2432,20 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@aws-sdk/util-user-agent-node@3.614.0: + resolution: {integrity: sha512-15ElZT88peoHnq5TEoEtZwoXTXRxNrk60TZNdpl/TUBJ5oNJ9Dqb5Z4ryb8ofN6nm9aFf59GVAerFDz8iUoHBA==} + engines: {node: '>=16.0.0'} + peerDependencies: + aws-crt: '>=1.0.0' + peerDependenciesMeta: + aws-crt: + optional: true + dependencies: + '@aws-sdk/types': 3.609.0 + '@smithy/node-config-provider': 3.1.4 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@aws-sdk/util-utf8-browser@3.259.0: resolution: {integrity: sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==} dependencies: @@ -1894,12 +2458,50 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@aws-sdk/xml-builder@3.609.0: + resolution: {integrity: sha512-l9XxNcA4HX98rwCC2/KoiWcmEiRfZe4G+mYwDbCFT87JIMj6GBhLDkAzr/W8KAaA2IDr8Vc6J8fZPgVulxxfMA==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/types': 3.3.0 + tslib: 2.6.2 + + /@azure-rest/ai-translation-text@1.0.0: + resolution: {integrity: sha512-Zt1nwHdvfEzM6EVnx4cLz6GNYS5gxYWbwA3dAr6+NM9CWb3vk+p2Vy/mleU53OSeJvkzhpjXJ78qiJh42JmcXA==} + engines: {node: '>=18.0.0'} + dependencies: + '@azure-rest/core-client': 1.4.0 + '@azure/core-auth': 1.5.0 + '@azure/core-rest-pipeline': 1.16.3 + '@azure/logger': 1.0.4 + tslib: 2.6.2 + transitivePeerDependencies: + - supports-color + + /@azure-rest/core-client@1.4.0: + resolution: {integrity: sha512-ozTDPBVUDR5eOnMIwhggbnVmOrka4fXCs8n8mvUo4WLLc38kki6bAOByDoVZZPz/pZy2jMt2kwfpvy/UjALj6w==} + engines: {node: '>=18.0.0'} + dependencies: + '@azure/abort-controller': 2.1.2 + '@azure/core-auth': 1.5.0 + '@azure/core-rest-pipeline': 1.16.3 + '@azure/core-tracing': 1.1.2 + '@azure/core-util': 1.6.1 + tslib: 2.6.2 + transitivePeerDependencies: + - supports-color + /@azure/abort-controller@1.1.0: resolution: {integrity: sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==} engines: {node: '>=12.0.0'} dependencies: tslib: 2.6.2 + /@azure/abort-controller@2.1.2: + resolution: {integrity: sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==} + engines: {node: '>=18.0.0'} + dependencies: + tslib: 2.6.2 + /@azure/core-auth@1.5.0: resolution: {integrity: sha512-udzoBuYG1VBoHVohDTrvKjyzel34zt77Bhp7dQntVGGD0ehVq48owENbBG8fIgkHRNUBQH5k1r0hpoMu5L8+kw==} engines: {node: '>=14.0.0'} @@ -1908,6 +2510,30 @@ packages: '@azure/core-util': 1.6.1 tslib: 2.6.2 + /@azure/core-client@1.9.2: + resolution: {integrity: sha512-kRdry/rav3fUKHl/aDLd/pDLcB+4pOFwPPTVEExuMyaI5r+JBbMWqRbCY1pn5BniDaU3lRxO9eaQ1AmSMehl/w==} + engines: {node: '>=18.0.0'} + dependencies: + '@azure/abort-controller': 2.1.2 + '@azure/core-auth': 1.5.0 + '@azure/core-rest-pipeline': 1.16.3 + '@azure/core-tracing': 1.1.2 + '@azure/core-util': 1.6.1 + '@azure/logger': 1.0.4 + tslib: 2.6.2 + transitivePeerDependencies: + - supports-color + + /@azure/core-http-compat@2.1.2: + resolution: {integrity: sha512-5MnV1yqzZwgNLLjlizsU3QqOeQChkIXw781Fwh1xdAqJR5AA32IUaq6xv1BICJvfbHoa+JYcaij2HFkhLbNTJQ==} + engines: {node: '>=18.0.0'} + dependencies: + '@azure/abort-controller': 2.1.2 + '@azure/core-client': 1.9.2 + '@azure/core-rest-pipeline': 1.16.3 + transitivePeerDependencies: + - supports-color + /@azure/core-http@3.0.4: resolution: {integrity: sha512-Fok9VVhMdxAFOtqiiAtg74fL0UJkt0z3D+ouUUxcRLzZNBioPRAMJFVxiWoJljYpXsRi4GDQHzQHDc9AiYaIUQ==} engines: {node: '>=14.0.0'} @@ -1944,6 +2570,27 @@ packages: dependencies: tslib: 2.6.2 + /@azure/core-rest-pipeline@1.16.3: + resolution: {integrity: sha512-VxLk4AHLyqcHsfKe4MZ6IQ+D+ShuByy+RfStKfSjxJoL3WBWq17VNmrz8aT8etKzqc2nAeIyLxScjpzsS4fz8w==} + engines: {node: '>=18.0.0'} + dependencies: + '@azure/abort-controller': 2.1.2 + '@azure/core-auth': 1.5.0 + '@azure/core-tracing': 1.1.2 + '@azure/core-util': 1.9.2 + '@azure/logger': 1.0.4 + http-proxy-agent: 7.0.2 + https-proxy-agent: 7.0.2 + tslib: 2.6.2 + transitivePeerDependencies: + - supports-color + + /@azure/core-sse@2.1.3: + resolution: {integrity: sha512-KSSdIKy8kvWCpYr8Hzpu22j3wcXsVTYE0IlgmI1T/aHvBDsLgV91y90UTfVWnuiuApRLCCVC4gS09ApBGOmYQA==} + engines: {node: '>=18.0.0'} + dependencies: + tslib: 2.6.2 + /@azure/core-tracing@1.0.0-preview.13: resolution: {integrity: sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==} engines: {node: '>=12.0.0'} @@ -1951,6 +2598,12 @@ packages: '@opentelemetry/api': 1.7.0 tslib: 2.6.2 + /@azure/core-tracing@1.1.2: + resolution: {integrity: sha512-dawW9ifvWAWmUm9/h+/UQ2jrdvjCJ7VJEuCJ6XVNudzcOwm53BFZH4Q845vjfgoUAM8ZxokvVNxNxAITc502YA==} + engines: {node: '>=18.0.0'} + dependencies: + tslib: 2.6.2 + /@azure/core-util@1.6.1: resolution: {integrity: sha512-h5taHeySlsV9qxuK64KZxy4iln1BtMYlNt5jbuEFN3UFSAd1EwKg/Gjl5a6tZ/W8t6li3xPnutOx7zbDyXnPmQ==} engines: {node: '>=16.0.0'} @@ -1958,12 +2611,40 @@ packages: '@azure/abort-controller': 1.1.0 tslib: 2.6.2 + /@azure/core-util@1.9.2: + resolution: {integrity: sha512-l1Qrqhi4x1aekkV+OlcqsJa4AnAkj5p0JV8omgwjaV9OAbP41lvrMvs+CptfetKkeEaGRGSzby7sjPZEX7+kkQ==} + engines: {node: '>=18.0.0'} + dependencies: + '@azure/abort-controller': 2.1.2 + tslib: 2.6.2 + + /@azure/core-xml@1.4.3: + resolution: {integrity: sha512-D6G7FEmDiTctPKuWegX2WTrS1enKZwqYwdKTO6ZN6JMigcCehlT0/CYl+zWpI9vQ9frwwp7GQT3/owaEXgnOsA==} + engines: {node: '>=18.0.0'} + dependencies: + fast-xml-parser: 4.3.3 + tslib: 2.6.2 + /@azure/logger@1.0.4: resolution: {integrity: sha512-ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg==} engines: {node: '>=14.0.0'} dependencies: tslib: 2.6.2 + /@azure/openai@1.0.0-beta.11: + resolution: {integrity: sha512-OXS27xkG1abiGf5VZUKnkJKr1VCo8+6EUrTGW5aSVjc5COqX8jAUqVAOZsQVCHBdtWYSBULlZkc0ncKMTRQAiQ==} + engines: {node: '>=18.0.0'} + dependencies: + '@azure-rest/core-client': 1.4.0 + '@azure/core-auth': 1.5.0 + '@azure/core-rest-pipeline': 1.16.3 + '@azure/core-sse': 2.1.3 + '@azure/core-util': 1.6.1 + '@azure/logger': 1.0.4 + tslib: 2.6.2 + transitivePeerDependencies: + - supports-color + /@azure/storage-blob@12.17.0: resolution: {integrity: sha512-sM4vpsCpcCApagRW5UIjQNlNylo02my2opgp0Emi8x888hZUvJ3dN69Oq20cEGXkMUWnoCrBaB0zyS3yeB87sQ==} engines: {node: '>=14.0.0'} @@ -1979,6 +2660,26 @@ packages: transitivePeerDependencies: - encoding + /@azure/storage-blob@12.24.0: + resolution: {integrity: sha512-l8cmWM4C7RoNCBOImoFMxhTXe1Lr+8uQ/IgnhRNMpfoA9bAFWoLG4XrWm6O5rKXortreVQuD+fc1hbzWklOZbw==} + engines: {node: '>=18.0.0'} + dependencies: + '@azure/abort-controller': 1.1.0 + '@azure/core-auth': 1.5.0 + '@azure/core-client': 1.9.2 + '@azure/core-http-compat': 2.1.2 + '@azure/core-lro': 2.5.4 + '@azure/core-paging': 1.5.0 + '@azure/core-rest-pipeline': 1.16.3 + '@azure/core-tracing': 1.1.2 + '@azure/core-util': 1.6.1 + '@azure/core-xml': 1.4.3 + '@azure/logger': 1.0.4 + events: 3.3.0 + tslib: 2.6.2 + transitivePeerDependencies: + - supports-color + /@babel/cli@7.23.4(@babel/core@7.23.7): resolution: {integrity: sha512-j3luA9xGKCXVyCa5R7lJvOMM+Kc2JEnAEIgz2ggtjQ/j5YUVgfsg/WsG95bbsgq7YLHuiCOzMnoSasuY16qiCw==} engines: {node: '>=6.9.0'} @@ -3863,12 +4564,10 @@ packages: - graphql - history - /@comet/blocks-api@6.8.0(@nestjs/common@9.4.3)(class-transformer@0.5.1)(class-validator@0.13.2): - resolution: {integrity: sha512-CC52ICQnK58OliLnGAubj6hnZ5J+KnnPBStPHoTAOC2XJpBEvCJMwzusLKSEW3+oGUzN7OKc6n4ws1hmEhvvyQ==} + /@comet/blocks-api@7.2.1(@nestjs/common@9.4.3): + resolution: {integrity: sha512-h/00Qs07vSaxcxBFLFXF875m7htMmbF9y5QXrCMKScjIVrivRp5+Ca1jpEDhiSagCxrmpLABYzK3gJLsSUOYew==} peerDependencies: '@nestjs/common': ^9.0.0 - class-transformer: ^0.5.0 - class-validator: ^0.13.0 dependencies: '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.13.2)(reflect-metadata@0.1.14)(rxjs@7.8.1) class-transformer: 0.5.1 @@ -3981,35 +4680,37 @@ packages: - draft-js - history - /@comet/cms-api@6.8.0(@aws-sdk/client-s3@3.490.0)(@azure/storage-blob@12.17.0)(@kubernetes/client-node@0.18.1)(@mikro-orm/cli@5.9.7)(@mikro-orm/core@5.9.7)(@mikro-orm/migrations@5.9.7)(@mikro-orm/nestjs@5.2.3)(@mikro-orm/postgresql@5.9.7)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/graphql@10.2.1)(class-transformer@0.5.1)(express@4.18.2)(graphql@15.8.0)(nestjs-console@8.0.0)(pg-error-constants@1.0.0)(rxjs@7.8.1): - resolution: {integrity: sha512-SaK5Z6jyzpxenAYKDivU6tp1OKyAvbLYbkcbPYAvn3u/H/1lau56ugUCXqgDE5xLKVXgQav2zgFRNo9cp5aR+Q==} + /@comet/cms-api@7.2.1(@kubernetes/client-node@0.18.1)(@mikro-orm/core@5.9.7)(@mikro-orm/migrations@5.9.7)(@mikro-orm/nestjs@5.2.3)(@mikro-orm/postgresql@5.9.7)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/graphql@10.2.1)(@nestjs/platform-express@9.4.3)(express@4.18.2)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1): + resolution: {integrity: sha512-atzg54MInYiMPOYWndFKWsnSZdP2aHCNI0kDqW8viuAaF/g9DNX6ecKFiZRzLG73iY5JZElKgpEKgbx7yf81lg==} hasBin: true peerDependencies: - '@aws-sdk/client-s3': ^3.47.0 - '@azure/storage-blob': ^12.0.0 '@kubernetes/client-node': '>=0.18.0' - '@mikro-orm/cli': ^5.0.4 - '@mikro-orm/core': ^5.0.4 - '@mikro-orm/migrations': ^5.0.4 + '@mikro-orm/core': ^5.8.4 + '@mikro-orm/migrations': ^5.8.4 '@mikro-orm/nestjs': ^5.1.0 - '@mikro-orm/postgresql': ^5.0.4 + '@mikro-orm/postgresql': ^5.8.4 '@nestjs/common': ^9.0.0 '@nestjs/core': ^9.0.0 '@nestjs/graphql': ^10.0.0 - class-transformer: ^0.5.0 + '@nestjs/platform-express': ^9.0.0 + '@sentry/node': ^7.0.0 express: ^4.0.0 graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 nestjs-console: ^8.0.0 - pg-error-constants: ^1.0.0 rxjs: ^7.0.0 + peerDependenciesMeta: + '@sentry/node': + optional: true dependencies: - '@aws-sdk/client-s3': 3.490.0 - '@azure/storage-blob': 12.17.0 - '@comet/blocks-api': 6.8.0(@nestjs/common@9.4.3)(class-transformer@0.5.1)(class-validator@0.13.2) + '@aws-sdk/client-s3': 3.637.0 + '@azure-rest/ai-translation-text': 1.0.0 + '@azure/openai': 1.0.0-beta.11 + '@azure/storage-blob': 12.24.0 + '@comet/blocks-api': 7.2.1(@nestjs/common@9.4.3) + '@fast-csv/parse': 4.3.6 '@golevelup/nestjs-discovery': 3.0.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) '@hapi/accept': 5.0.2 '@kubernetes/client-node': 0.18.1 - '@mikro-orm/cli': 5.9.7(@mikro-orm/migrations@5.9.7)(@mikro-orm/postgresql@5.9.7) '@mikro-orm/core': 5.9.7(@mikro-orm/migrations@5.9.7)(@mikro-orm/postgresql@5.9.7) '@mikro-orm/migrations': 5.9.7(@mikro-orm/core@5.9.7) '@mikro-orm/nestjs': 5.2.3(@mikro-orm/core@5.9.7)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) @@ -4020,6 +4721,7 @@ packages: '@nestjs/jwt': 9.0.0(@nestjs/common@9.4.3) '@nestjs/mapped-types': 1.2.2(@nestjs/common@9.4.3)(class-transformer@0.5.1)(class-validator@0.13.2)(reflect-metadata@0.1.14) '@nestjs/passport': 9.0.3(@nestjs/common@9.4.3)(passport@0.6.0) + '@nestjs/platform-express': 9.4.3(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) '@opentelemetry/api': 1.7.0 '@types/get-image-colors': 4.0.5 base64url: 3.0.1 @@ -4037,7 +4739,7 @@ packages: got: 11.8.6 graphql: 15.8.0 graphql-parse-resolve-info: 4.13.0(graphql@15.8.0) - graphql-type-json: 0.3.2(graphql@15.8.0) + graphql-scalars: 1.23.0(graphql@15.8.0) hasha: 5.2.2 jsonwebtoken: 8.5.1 jszip: 3.10.1 @@ -4052,7 +4754,6 @@ packages: passport-custom: 1.1.1 passport-http: 0.3.0 passport-jwt: 4.0.1 - pg-error-constants: 1.0.0 pluralize: 8.0.0 probe-image-size: 7.2.3 reflect-metadata: 0.1.14 @@ -4064,6 +4765,7 @@ packages: uuid: 9.0.1 uuid-by-string: 4.0.0 transitivePeerDependencies: + - aws-crt - encoding - supports-color @@ -4164,24 +4866,25 @@ packages: - typescript dev: true - /@comet/eslint-config@6.8.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@27.1.5)(typescript@4.9.5): - resolution: {integrity: sha512-Spr1+2qp/EzDGrrjGlI3hXrdeqr9lXU02TTIzqkcK+CR/AhR3SDA5cCVLdJiYt8BxR1G5Y0M/wAZYePgje8TcA==} + /@comet/eslint-config@7.2.1(eslint@8.56.0)(prettier@2.8.8)(ts-jest@27.1.5)(typescript@4.9.5): + resolution: {integrity: sha512-bn9wTTRcJ/Q4Zl1Rzgp1wP2SQGh2zQff+ATPUctsta89yV9odPV8fHWL8DkmrVKuLpQXm0FLvRaPNK+33f0V8Q==} peerDependencies: eslint: '>= 8' next: '*' - prettier: '>= 2' + prettier: ^2.0.0 peerDependenciesMeta: next: optional: true dependencies: '@calm/eslint-plugin-react-intl': 1.4.1 - '@comet/eslint-plugin': 6.8.0(eslint@8.56.0) - '@next/eslint-plugin-next': 12.3.4 + '@comet/eslint-plugin': 7.2.1(eslint@8.56.0) + '@next/eslint-plugin-next': 14.2.7 '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@4.9.5) '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@4.9.5) eslint: 8.56.0 - eslint-config-next: 13.5.6(eslint@8.56.0)(typescript@4.9.5) + eslint-config-next: 14.2.7(eslint@8.56.0)(typescript@4.9.5) eslint-config-prettier: 8.10.0(eslint@8.56.0) + eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.56.0) eslint-plugin-formatjs: 4.12.1(eslint@8.56.0)(ts-jest@27.1.5) eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0) eslint-plugin-json-files: 2.2.0(eslint@8.56.0) @@ -4190,33 +4893,35 @@ packages: eslint-plugin-react-hooks: 4.6.0(eslint@8.56.0) eslint-plugin-simple-import-sort: 9.0.0(eslint@8.56.0) eslint-plugin-unused-imports: 2.0.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.56.0) + npm-run-all: 4.1.5 prettier: 2.8.8 transitivePeerDependencies: - - eslint-import-resolver-typescript + - eslint-import-resolver-node - eslint-import-resolver-webpack - supports-color - ts-jest - typescript dev: true - /@comet/eslint-config@6.8.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@29.1.1)(typescript@4.9.5): - resolution: {integrity: sha512-Spr1+2qp/EzDGrrjGlI3hXrdeqr9lXU02TTIzqkcK+CR/AhR3SDA5cCVLdJiYt8BxR1G5Y0M/wAZYePgje8TcA==} + /@comet/eslint-config@7.2.1(eslint@8.56.0)(prettier@2.8.8)(ts-jest@29.1.1)(typescript@4.9.5): + resolution: {integrity: sha512-bn9wTTRcJ/Q4Zl1Rzgp1wP2SQGh2zQff+ATPUctsta89yV9odPV8fHWL8DkmrVKuLpQXm0FLvRaPNK+33f0V8Q==} peerDependencies: eslint: '>= 8' next: '*' - prettier: '>= 2' + prettier: ^2.0.0 peerDependenciesMeta: next: optional: true dependencies: '@calm/eslint-plugin-react-intl': 1.4.1 - '@comet/eslint-plugin': 6.8.0(eslint@8.56.0) - '@next/eslint-plugin-next': 12.3.4 + '@comet/eslint-plugin': 7.2.1(eslint@8.56.0) + '@next/eslint-plugin-next': 14.2.7 '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@4.9.5) '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@4.9.5) eslint: 8.56.0 - eslint-config-next: 13.5.6(eslint@8.56.0)(typescript@4.9.5) + eslint-config-next: 14.2.7(eslint@8.56.0)(typescript@4.9.5) eslint-config-prettier: 8.10.0(eslint@8.56.0) + eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.56.0) eslint-plugin-formatjs: 4.12.1(eslint@8.56.0)(ts-jest@29.1.1) eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0) eslint-plugin-json-files: 2.2.0(eslint@8.56.0) @@ -4225,9 +4930,10 @@ packages: eslint-plugin-react-hooks: 4.6.0(eslint@8.56.0) eslint-plugin-simple-import-sort: 9.0.0(eslint@8.56.0) eslint-plugin-unused-imports: 2.0.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.56.0) + npm-run-all: 4.1.5 prettier: 2.8.8 transitivePeerDependencies: - - eslint-import-resolver-typescript + - eslint-import-resolver-node - eslint-import-resolver-webpack - supports-color - ts-jest @@ -4242,6 +4948,14 @@ packages: eslint: 8.56.0 dev: true + /@comet/eslint-plugin@7.2.1(eslint@8.56.0): + resolution: {integrity: sha512-TTNgMJSdczM03X/a7FN7fps30irkyWxgTd/dtLrUNcAqXLJFmoLsSxToNrojhIKp0Qx2cOmzAplnuFbkGWYyQg==} + peerDependencies: + eslint: '8' + dependencies: + eslint: 8.56.0 + dev: true + /@cspotcode/source-map-support@0.8.1: resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==} engines: {node: '>=12'} @@ -5530,7 +6244,6 @@ packages: strip-ansi-cjs: /strip-ansi@6.0.1 wrap-ansi: 8.1.0 wrap-ansi-cjs: /wrap-ansi@7.0.0 - dev: false /@istanbuljs/load-nyc-config@1.1.0: resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==} @@ -6859,6 +7572,12 @@ packages: glob: 7.1.7 dev: true + /@next/eslint-plugin-next@14.2.7: + resolution: {integrity: sha512-+7xh142AdhZGjY9/L0iFo7mqRBMJHe+q+uOL+hto1Lfo9DeWCGcR6no4StlFbVSVcA6fQLKEX6y6qhMsSKbgNQ==} + dependencies: + glob: 10.3.10 + dev: true + /@next/swc-android-arm-eabi@12.3.4: resolution: {integrity: sha512-cM42Cw6V4Bz/2+j/xIzO8nK/Q3Ly+VSlZJTa1vHzsocJRYz8KT6MrreXaci2++SIZCF1rVRCDgAg5PpqRibdIA==} engines: {node: '>= 10'} @@ -7986,7 +8705,6 @@ packages: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} requiresBuild: true - dev: false optional: true /@polka/url@1.0.0-next.24: @@ -8118,17 +8836,35 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/abort-controller@3.1.1: + resolution: {integrity: sha512-MBJBiidoe+0cTFhyxT8g+9g7CeVccLM0IOKKUMCNQ1CNMJ/eIfoo0RTfVrXOONEI1UCN1W+zkiHSbzUNE9dZtQ==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/chunked-blob-reader-native@2.0.1: resolution: {integrity: sha512-N2oCZRglhWKm7iMBu7S6wDzXirjAofi7tAd26cxmgibRYOBS4D3hGfmkwCpHdASZzwZDD8rluh0Rcqw1JeZDRw==} dependencies: '@smithy/util-base64': 2.0.1 tslib: 2.6.2 + /@smithy/chunked-blob-reader-native@3.0.0: + resolution: {integrity: sha512-VDkpCYW+peSuM4zJip5WDfqvg2Mo/e8yxOv3VF1m11y7B8KKMKVFtmZWDe36Fvk8rGuWrPZHHXZ7rR7uM5yWyg==} + dependencies: + '@smithy/util-base64': 3.0.0 + tslib: 2.6.2 + /@smithy/chunked-blob-reader@2.0.0: resolution: {integrity: sha512-k+J4GHJsMSAIQPChGBrjEmGS+WbPonCXesoqP9fynIqjn7rdOThdH8FAeCmokP9mxTYKQAKoHCLPzNlm6gh7Wg==} dependencies: tslib: 2.6.2 + /@smithy/chunked-blob-reader@3.0.0: + resolution: {integrity: sha512-sbnURCwjF0gSToGlsBiAmd1lRCmSn72nu9axfJu5lIx6RUEgHu6GwTMbqCdhQSi0Pumcm5vFxsi9XWXb2mTaoA==} + dependencies: + tslib: 2.6.2 + /@smithy/config-resolver@2.0.23: resolution: {integrity: sha512-XakUqgtP2YY8Mi+Nlif5BiqJgWdvfxJafSpOSQeCOMizu+PUhE4fBQSy6xFcR+eInrwVadaABNxoJyGUMn15ew==} engines: {node: '>=14.0.0'} @@ -8139,6 +8875,16 @@ packages: '@smithy/util-middleware': 2.0.9 tslib: 2.6.2 + /@smithy/config-resolver@3.0.5: + resolution: {integrity: sha512-SkW5LxfkSI1bUC74OtfBbdz+grQXYiPYolyu8VfpLIjEoN/sHVBlLeGXMQ1vX4ejkgfv6sxVbQJ32yF2cl1veA==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/node-config-provider': 3.1.4 + '@smithy/types': 3.3.0 + '@smithy/util-config-provider': 3.0.0 + '@smithy/util-middleware': 3.0.3 + tslib: 2.6.2 + /@smithy/core@1.2.2: resolution: {integrity: sha512-uLjrskLT+mWb0emTR5QaiAIxVEU7ndpptDaVDrTwwhD+RjvHhjIiGQ3YL5jKk1a5VSDQUA2RGkXvJ6XKRcz6Dg==} engines: {node: '>=14.0.0'} @@ -8152,6 +8898,21 @@ packages: '@smithy/util-middleware': 2.0.9 tslib: 2.6.2 + /@smithy/core@2.4.0: + resolution: {integrity: sha512-cHXq+FneIF/KJbt4q4pjN186+Jf4ZB0ZOqEaZMBhT79srEyGDDBV31NqBRBjazz8ppQ1bJbDJMY9ba5wKFV36w==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/middleware-endpoint': 3.1.0 + '@smithy/middleware-retry': 3.0.15 + '@smithy/middleware-serde': 3.0.3 + '@smithy/protocol-http': 4.1.0 + '@smithy/smithy-client': 3.2.0 + '@smithy/types': 3.3.0 + '@smithy/util-body-length-browser': 3.0.0 + '@smithy/util-middleware': 3.0.3 + '@smithy/util-utf8': 3.0.0 + tslib: 2.6.2 + /@smithy/credential-provider-imds@2.1.5: resolution: {integrity: sha512-VfvE6Wg1MUWwpTZFBnUD7zxvPhLY8jlHCzu6bCjlIYoWgXCDzZAML76IlZUEf45nib3rjehnFgg0s1rgsuN/bg==} engines: {node: '>=14.0.0'} @@ -8162,6 +8923,16 @@ packages: '@smithy/url-parser': 2.0.16 tslib: 2.6.2 + /@smithy/credential-provider-imds@3.2.0: + resolution: {integrity: sha512-0SCIzgd8LYZ9EJxUjLXBmEKSZR/P/w6l7Rz/pab9culE/RWuqelAKGJvn5qUOl8BgX8Yj5HWM50A5hiB/RzsgA==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/node-config-provider': 3.1.4 + '@smithy/property-provider': 3.1.3 + '@smithy/types': 3.3.0 + '@smithy/url-parser': 3.0.3 + tslib: 2.6.2 + /@smithy/eventstream-codec@2.0.16: resolution: {integrity: sha512-umYh5pdCE9GHgiMAH49zu9wXWZKNHHdKPm/lK22WYISTjqu29SepmpWNmPiBLy/yUu4HFEGJHIFrDWhbDlApaw==} dependencies: @@ -8170,6 +8941,14 @@ packages: '@smithy/util-hex-encoding': 2.0.0 tslib: 2.6.2 + /@smithy/eventstream-codec@3.1.2: + resolution: {integrity: sha512-0mBcu49JWt4MXhrhRAlxASNy0IjDRFU+aWNDRal9OtUJvJNiwDuyKMUONSOjLjSCeGwZaE0wOErdqULer8r7yw==} + dependencies: + '@aws-crypto/crc32': 5.2.0 + '@smithy/types': 3.3.0 + '@smithy/util-hex-encoding': 3.0.0 + tslib: 2.6.2 + /@smithy/eventstream-serde-browser@2.0.16: resolution: {integrity: sha512-W+BdiN728R57KuZOcG0GczpIOEFf8S5RP/OdVH7T3FMCy8HU2bBU0vB5xZZR5c00VRdoeWrohNv3XlHoZuGRoA==} engines: {node: '>=14.0.0'} @@ -8178,6 +8957,14 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/eventstream-serde-browser@3.0.6: + resolution: {integrity: sha512-2hM54UWQUOrki4BtsUI1WzmD13/SeaqT/AB3EUJKbcver/WgKNaiJ5y5F5XXuVe6UekffVzuUDrBZVAA3AWRpQ==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/eventstream-serde-universal': 3.0.5 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/eventstream-serde-config-resolver@2.0.16: resolution: {integrity: sha512-8qrE4nh+Tg6m1SMFK8vlzoK+8bUFTlIhXidmmQfASMninXW3Iu0T0bI4YcIk4nLznHZdybQ0qGydIanvVZxzVg==} engines: {node: '>=14.0.0'} @@ -8185,6 +8972,13 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/eventstream-serde-config-resolver@3.0.3: + resolution: {integrity: sha512-NVTYjOuYpGfrN/VbRQgn31x73KDLfCXCsFdad8DiIc3IcdxL+dYA9zEQPyOP7Fy2QL8CPy2WE4WCUD+ZsLNfaQ==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/eventstream-serde-node@2.0.16: resolution: {integrity: sha512-NRNQuOa6mQdFSkqzY0IV37swHWx0SEoKxFtUfdZvfv0AVQPlSw4N7E3kcRSCpnHBr1kCuWWirdDlWcjWuD81MA==} engines: {node: '>=14.0.0'} @@ -8193,6 +8987,14 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/eventstream-serde-node@3.0.5: + resolution: {integrity: sha512-+upXvnHNyZP095s11jF5dhGw/Ihzqwl5G+/KtMnoQOpdfC3B5HYCcDVG9EmgkhJMXJlM64PyN5gjJl0uXFQehQ==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/eventstream-serde-universal': 3.0.5 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/eventstream-serde-universal@2.0.16: resolution: {integrity: sha512-ZyLnGaYQMLc75j9kKEVMJ3X6bdBE9qWxhZdTXM5RIltuytxJC3FaOhawBxjE+IL1enmWSIohHGZCm/pLwEliQA==} engines: {node: '>=14.0.0'} @@ -8201,6 +9003,14 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/eventstream-serde-universal@3.0.5: + resolution: {integrity: sha512-5u/nXbyoh1s4QxrvNre9V6vfyoLWuiVvvd5TlZjGThIikc3G+uNiG9uOTCWweSRjv1asdDIWK7nOmN7le4RYHQ==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/eventstream-codec': 3.1.2 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/fetch-http-handler@2.3.2: resolution: {integrity: sha512-O9R/OlnAOTsnysuSDjt0v2q6DcSvCz5cCFC/CFAWWcLyBwJDeFyGTCTszgpQTb19+Fi8uRwZE5/3ziAQBFeDMQ==} dependencies: @@ -8210,6 +9020,15 @@ packages: '@smithy/util-base64': 2.0.1 tslib: 2.6.2 + /@smithy/fetch-http-handler@3.2.4: + resolution: {integrity: sha512-kBprh5Gs5h7ug4nBWZi1FZthdqSM+T7zMmsZxx0IBvWUn7dK3diz2SHn7Bs4dQGFDk8plDv375gzenDoNwrXjg==} + dependencies: + '@smithy/protocol-http': 4.1.0 + '@smithy/querystring-builder': 3.0.3 + '@smithy/types': 3.3.0 + '@smithy/util-base64': 3.0.0 + tslib: 2.6.2 + /@smithy/hash-blob-browser@2.0.17: resolution: {integrity: sha512-/mPpv1sRiRDdjO4zZuO8be6eeabmg5AVgKDfnmmqkpBtRyMGSJb968fjRuHt+FRAsIGywgIKJFmUUAYjhsi1oQ==} dependencies: @@ -8218,6 +9037,14 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/hash-blob-browser@3.1.2: + resolution: {integrity: sha512-hAbfqN2UbISltakCC2TP0kx4LqXBttEv2MqSPE98gVuDFMf05lU+TpC41QtqGP3Ff5A3GwZMPfKnEy0VmEUpmg==} + dependencies: + '@smithy/chunked-blob-reader': 3.0.0 + '@smithy/chunked-blob-reader-native': 3.0.0 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/hash-node@2.0.18: resolution: {integrity: sha512-gN2JFvAgnZCyDN9rJgcejfpK0uPPJrSortVVVVWsru9whS7eQey6+gj2eM5ln2i6rHNntIXzal1Fm9XOPuoaKA==} engines: {node: '>=14.0.0'} @@ -8227,6 +9054,15 @@ packages: '@smithy/util-utf8': 2.0.2 tslib: 2.6.2 + /@smithy/hash-node@3.0.3: + resolution: {integrity: sha512-2ctBXpPMG+B3BtWSGNnKELJ7SH9e4TNefJS0cd2eSkOOROeBnnVBnAy9LtJ8tY4vUEoe55N4CNPxzbWvR39iBw==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/types': 3.3.0 + '@smithy/util-buffer-from': 3.0.0 + '@smithy/util-utf8': 3.0.0 + tslib: 2.6.2 + /@smithy/hash-stream-node@2.0.18: resolution: {integrity: sha512-OuFk+ITpv8CtxGjQcS8GA04faNycu9UMm6YobvQzjeEoXZ0dLF6sRfuzD+3S8RHPKpTyLuXtKG1+GiJycZ5TcA==} engines: {node: '>=14.0.0'} @@ -8235,18 +9071,38 @@ packages: '@smithy/util-utf8': 2.0.2 tslib: 2.6.2 + /@smithy/hash-stream-node@3.1.2: + resolution: {integrity: sha512-PBgDMeEdDzi6JxKwbfBtwQG9eT9cVwsf0dZzLXoJF4sHKHs5HEo/3lJWpn6jibfJwT34I1EBXpBnZE8AxAft6g==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/types': 3.3.0 + '@smithy/util-utf8': 3.0.0 + tslib: 2.6.2 + /@smithy/invalid-dependency@2.0.16: resolution: {integrity: sha512-apEHakT/kmpNo1VFHP4W/cjfeP9U0x5qvfsLJubgp7UM/gq4qYp0GbqdE7QhsjUaYvEnrftRqs7+YrtWreV0wA==} dependencies: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/invalid-dependency@3.0.3: + resolution: {integrity: sha512-ID1eL/zpDULmHJbflb864k72/SNOZCADRc9i7Exq3RUNJw6raWUSlFEQ+3PX3EYs++bTxZB2dE9mEHTQLv61tw==} + dependencies: + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/is-array-buffer@2.0.0: resolution: {integrity: sha512-z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug==} engines: {node: '>=14.0.0'} dependencies: tslib: 2.6.2 + /@smithy/is-array-buffer@3.0.0: + resolution: {integrity: sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==} + engines: {node: '>=16.0.0'} + dependencies: + tslib: 2.6.2 + /@smithy/md5-js@2.0.18: resolution: {integrity: sha512-bHwZ8/m6RbERQdVW5rJ2LzeW8qxfXv6Q/S7Fiudhso4pWRrksqLx3nsGZw7bmqqfN4zLqkxydxSa9+4c7s5zxg==} dependencies: @@ -8254,6 +9110,13 @@ packages: '@smithy/util-utf8': 2.0.2 tslib: 2.6.2 + /@smithy/md5-js@3.0.3: + resolution: {integrity: sha512-O/SAkGVwpWmelpj/8yDtsaVe6sINHLB1q8YE/+ZQbDxIw3SRLbTZuRaI10K12sVoENdnHqzPp5i3/H+BcZ3m3Q==} + dependencies: + '@smithy/types': 3.3.0 + '@smithy/util-utf8': 3.0.0 + tslib: 2.6.2 + /@smithy/middleware-content-length@2.0.18: resolution: {integrity: sha512-ZJ9uKPTfxYheTKSKYB+GCvcj+izw9WGzRLhjn8n254q0jWLojUzn7Vw0l4R/Gq7Wdpf/qmk/ptD+6CCXHNVCaw==} engines: {node: '>=14.0.0'} @@ -8262,6 +9125,14 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/middleware-content-length@3.0.5: + resolution: {integrity: sha512-ILEzC2eyxx6ncej3zZSwMpB5RJ0zuqH7eMptxC4KN3f+v9bqT8ohssKbhNR78k/2tWW+KS5Spw+tbPF4Ejyqvw==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/protocol-http': 4.1.0 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/middleware-endpoint@2.3.0: resolution: {integrity: sha512-VsOAG2YQ8ykjSmKO+CIXdJBIWFo6AAvG6Iw95BakBTqk66/4BI7XyqLevoNSq/lZ6NgZv24sLmrcIN+fLDWBCg==} engines: {node: '>=14.0.0'} @@ -8274,6 +9145,18 @@ packages: '@smithy/util-middleware': 2.0.9 tslib: 2.6.2 + /@smithy/middleware-endpoint@3.1.0: + resolution: {integrity: sha512-5y5aiKCEwg9TDPB4yFE7H6tYvGFf1OJHNczeY10/EFF8Ir8jZbNntQJxMWNfeQjC1mxPsaQ6mR9cvQbf+0YeMw==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/middleware-serde': 3.0.3 + '@smithy/node-config-provider': 3.1.4 + '@smithy/shared-ini-file-loader': 3.1.4 + '@smithy/types': 3.3.0 + '@smithy/url-parser': 3.0.3 + '@smithy/util-middleware': 3.0.3 + tslib: 2.6.2 + /@smithy/middleware-retry@2.0.26: resolution: {integrity: sha512-Qzpxo0U5jfNiq9iD38U3e2bheXwvTEX4eue9xruIvEgh+UKq6dKuGqcB66oBDV7TD/mfoJi9Q/VmaiqwWbEp7A==} engines: {node: '>=14.0.0'} @@ -8288,6 +9171,20 @@ packages: tslib: 2.6.2 uuid: 8.3.2 + /@smithy/middleware-retry@3.0.15: + resolution: {integrity: sha512-iTMedvNt1ApdvkaoE8aSDuwaoc+BhvHqttbA/FO4Ty+y/S5hW6Ci/CTScG7vam4RYJWZxdTElc3MEfHRVH6cgQ==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/node-config-provider': 3.1.4 + '@smithy/protocol-http': 4.1.0 + '@smithy/service-error-classification': 3.0.3 + '@smithy/smithy-client': 3.2.0 + '@smithy/types': 3.3.0 + '@smithy/util-middleware': 3.0.3 + '@smithy/util-retry': 3.0.3 + tslib: 2.6.2 + uuid: 9.0.1 + /@smithy/middleware-serde@2.0.16: resolution: {integrity: sha512-5EAd4t30pcc4M8TSSGq7q/x5IKrxfXR5+SrU4bgxNy7RPHQo2PSWBUco9C+D9Tfqp/JZvprRpK42dnupZafk2g==} engines: {node: '>=14.0.0'} @@ -8295,6 +9192,13 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/middleware-serde@3.0.3: + resolution: {integrity: sha512-puUbyJQBcg9eSErFXjKNiGILJGtiqmuuNKEYNYfUD57fUl4i9+mfmThtQhvFXU0hCVG0iEJhvQUipUf+/SsFdA==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/middleware-stack@2.0.10: resolution: {integrity: sha512-I2rbxctNq9FAPPEcuA1ntZxkTKOPQFy7YBPOaD/MLg1zCvzv21CoNxR0py6J8ZVC35l4qE4nhxB0f7TF5/+Ldw==} engines: {node: '>=14.0.0'} @@ -8302,6 +9206,13 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/middleware-stack@3.0.3: + resolution: {integrity: sha512-r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/node-config-provider@2.1.9: resolution: {integrity: sha512-tUyW/9xrRy+s7RXkmQhgYkAPMpTIF8izK4orhHjNFEKR3QZiOCbWB546Y8iB/Fpbm3O9+q0Af9rpywLKJOwtaQ==} engines: {node: '>=14.0.0'} @@ -8311,6 +9222,15 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/node-config-provider@3.1.4: + resolution: {integrity: sha512-YvnElQy8HR4vDcAjoy7Xkx9YT8xZP4cBXcbJSgm/kxmiQu08DwUwj8rkGnyoJTpfl/3xYHH+d8zE+eHqoDCSdQ==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/property-provider': 3.1.3 + '@smithy/shared-ini-file-loader': 3.1.4 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/node-http-handler@2.2.2: resolution: {integrity: sha512-XO58TO/Eul/IBQKFKaaBtXJi0ItEQQCT+NI4IiKHCY/4KtqaUT6y/wC1EvDqlA9cP7Dyjdj7FdPs4DyynH3u7g==} engines: {node: '>=14.0.0'} @@ -8321,6 +9241,16 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/node-http-handler@3.1.4: + resolution: {integrity: sha512-+UmxgixgOr/yLsUxcEKGH0fMNVteJFGkmRltYFHnBMlogyFdpzn2CwqWmxOrfJELhV34v0WSlaqG1UtE1uXlJg==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/abort-controller': 3.1.1 + '@smithy/protocol-http': 4.1.0 + '@smithy/querystring-builder': 3.0.3 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/property-provider@2.0.17: resolution: {integrity: sha512-+VkeZbVu7qtQ2DjI48Qwaf9fPOr3gZIwxQpuLJgRRSkWsdSvmaTCxI3gzRFKePB63Ts9r4yjn4HkxSCSkdWmcQ==} engines: {node: '>=14.0.0'} @@ -8328,6 +9258,13 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/property-provider@3.1.3: + resolution: {integrity: sha512-zahyOVR9Q4PEoguJ/NrFP4O7SMAfYO1HLhB18M+q+Z4KFd4V2obiMnlVoUFzFLSPeVt1POyNWneHHrZaTMoc/g==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/protocol-http@3.0.12: resolution: {integrity: sha512-Xz4iaqLiaBfbQpB9Hgi3VcZYbP7xRDXYhd8XWChh4v94uw7qwmvlxdU5yxzfm6ACJM66phHrTbS5TVvj5uQ72w==} engines: {node: '>=14.0.0'} @@ -8335,6 +9272,13 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/protocol-http@4.1.0: + resolution: {integrity: sha512-dPVoHYQ2wcHooGXg3LQisa1hH0e4y0pAddPMeeUPipI1tEOqL6A4N0/G7abeq+K8wrwSgjk4C0wnD1XZpJm5aA==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/querystring-builder@2.0.16: resolution: {integrity: sha512-Q/GsJT0C0mijXMRs7YhZLLCP5FcuC4797lYjKQkME5CZohnLC4bEhylAd2QcD3gbMKNjCw8+T2I27WKiV/wToA==} engines: {node: '>=14.0.0'} @@ -8343,6 +9287,14 @@ packages: '@smithy/util-uri-escape': 2.0.0 tslib: 2.6.2 + /@smithy/querystring-builder@3.0.3: + resolution: {integrity: sha512-vyWckeUeesFKzCDaRwWLUA1Xym9McaA6XpFfAK5qI9DKJ4M33ooQGqvM4J+LalH4u/Dq9nFiC8U6Qn1qi0+9zw==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/types': 3.3.0 + '@smithy/util-uri-escape': 3.0.0 + tslib: 2.6.2 + /@smithy/querystring-parser@2.0.16: resolution: {integrity: sha512-c4ueAuL6BDYKWpkubjrQthZKoC3L5kql5O++ovekNxiexRXTlLIVlCR4q3KziOktLIw66EU9SQljPXd/oN6Okg==} engines: {node: '>=14.0.0'} @@ -8350,12 +9302,25 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/querystring-parser@3.0.3: + resolution: {integrity: sha512-zahM1lQv2YjmznnfQsWbYojFe55l0SLG/988brlLv1i8z3dubloLF+75ATRsqPBboUXsW6I9CPGE5rQgLfY0vQ==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/service-error-classification@2.0.9: resolution: {integrity: sha512-0K+8GvtwI7VkGmmInPydM2XZyBfIqLIbfR7mDQ+oPiz8mIinuHbV6sxOLdvX1Jv/myk7XTK9orgt3tuEpBu/zg==} engines: {node: '>=14.0.0'} dependencies: '@smithy/types': 2.8.0 + /@smithy/service-error-classification@3.0.3: + resolution: {integrity: sha512-Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/types': 3.3.0 + /@smithy/shared-ini-file-loader@2.2.8: resolution: {integrity: sha512-E62byatbwSWrtq9RJ7xN40tqrRKDGrEL4EluyNpaIDvfvet06a/QC58oHw2FgVaEgkj0tXZPjZaKrhPfpoU0qw==} engines: {node: '>=14.0.0'} @@ -8363,6 +9328,13 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/shared-ini-file-loader@3.1.4: + resolution: {integrity: sha512-qMxS4hBGB8FY2GQqshcRUy1K6k8aBWP5vwm8qKkCT3A9K2dawUwOIJfqh9Yste/Bl0J2lzosVyrXDj68kLcHXQ==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/signature-v4@2.0.19: resolution: {integrity: sha512-nwc3JihdM+kcJjtORv/n7qRHN2Kfh7S2RJI2qr8pz9UcY5TD8rSCRGQ0g81HgyS3jZ5X9U/L4p014P3FonBPhg==} engines: {node: '>=14.0.0'} @@ -8376,6 +9348,19 @@ packages: '@smithy/util-utf8': 2.0.2 tslib: 2.6.2 + /@smithy/signature-v4@4.1.0: + resolution: {integrity: sha512-aRryp2XNZeRcOtuJoxjydO6QTaVhxx/vjaR+gx7ZjaFgrgPRyZ3HCTbfwqYj6ZWEBHkCSUfcaymKPURaByukag==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/is-array-buffer': 3.0.0 + '@smithy/protocol-http': 4.1.0 + '@smithy/types': 3.3.0 + '@smithy/util-hex-encoding': 3.0.0 + '@smithy/util-middleware': 3.0.3 + '@smithy/util-uri-escape': 3.0.0 + '@smithy/util-utf8': 3.0.0 + tslib: 2.6.2 + /@smithy/smithy-client@2.2.1: resolution: {integrity: sha512-SpD7FLK92XV2fon2hMotaNDa2w5VAy5/uVjP9WFmjGSgWM8pTPVkHcDl1yFs5Z8LYbij0FSz+DbCBK6i+uXXUA==} engines: {node: '>=14.0.0'} @@ -8387,12 +9372,29 @@ packages: '@smithy/util-stream': 2.0.24 tslib: 2.6.2 + /@smithy/smithy-client@3.2.0: + resolution: {integrity: sha512-pDbtxs8WOhJLJSeaF/eAbPgXg4VVYFlRcL/zoNYA5WbG3wBL06CHtBSg53ppkttDpAJ/hdiede+xApip1CwSLw==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/middleware-endpoint': 3.1.0 + '@smithy/middleware-stack': 3.0.3 + '@smithy/protocol-http': 4.1.0 + '@smithy/types': 3.3.0 + '@smithy/util-stream': 3.1.3 + tslib: 2.6.2 + /@smithy/types@2.8.0: resolution: {integrity: sha512-h9sz24cFgt/W1Re22OlhQKmUZkNh244ApgRsUDYinqF8R+QgcsBIX344u2j61TPshsTz3CvL6HYU1DnQdsSrHA==} engines: {node: '>=14.0.0'} dependencies: tslib: 2.6.2 + /@smithy/types@3.3.0: + resolution: {integrity: sha512-IxvBBCTFDHbVoK7zIxqA1ZOdc4QfM5HM7rGleCuHi7L1wnKv5Pn69xXJQ9hgxH60ZVygH9/JG0jRgtUncE3QUA==} + engines: {node: '>=16.0.0'} + dependencies: + tslib: 2.6.2 + /@smithy/url-parser@2.0.16: resolution: {integrity: sha512-Wfz5WqAoRT91TjRy1JeLR0fXtkIXHGsMbgzKFTx7E68SrZ55TB8xoG+vm11Ru4gheFTMXjAjwAxv1jQdC+pAQA==} dependencies: @@ -8400,6 +9402,13 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/url-parser@3.0.3: + resolution: {integrity: sha512-pw3VtZtX2rg+s6HMs6/+u9+hu6oY6U7IohGhVNnjbgKy86wcIsSZwgHrFR+t67Uyxvp4Xz3p3kGXXIpTNisq8A==} + dependencies: + '@smithy/querystring-parser': 3.0.3 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/util-base64@2.0.1: resolution: {integrity: sha512-DlI6XFYDMsIVN+GH9JtcRp3j02JEVuWIn/QOZisVzpIAprdsxGveFed0bjbMRCqmIFe8uetn5rxzNrBtIGrPIQ==} engines: {node: '>=14.0.0'} @@ -8407,17 +9416,36 @@ packages: '@smithy/util-buffer-from': 2.0.0 tslib: 2.6.2 + /@smithy/util-base64@3.0.0: + resolution: {integrity: sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/util-buffer-from': 3.0.0 + '@smithy/util-utf8': 3.0.0 + tslib: 2.6.2 + /@smithy/util-body-length-browser@2.0.1: resolution: {integrity: sha512-NXYp3ttgUlwkaug4bjBzJ5+yIbUbUx8VsSLuHZROQpoik+gRkIBeEG9MPVYfvPNpuXb/puqodeeUXcKFe7BLOQ==} dependencies: tslib: 2.6.2 + /@smithy/util-body-length-browser@3.0.0: + resolution: {integrity: sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==} + dependencies: + tslib: 2.6.2 + /@smithy/util-body-length-node@2.1.0: resolution: {integrity: sha512-/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw==} engines: {node: '>=14.0.0'} dependencies: tslib: 2.6.2 + /@smithy/util-body-length-node@3.0.0: + resolution: {integrity: sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==} + engines: {node: '>=16.0.0'} + dependencies: + tslib: 2.6.2 + /@smithy/util-buffer-from@2.0.0: resolution: {integrity: sha512-/YNnLoHsR+4W4Vf2wL5lGv0ksg8Bmk3GEGxn2vEQt52AQaPSCuaO5PM5VM7lP1K9qHRKHwrPGktqVoAHKWHxzw==} engines: {node: '>=14.0.0'} @@ -8425,12 +9453,25 @@ packages: '@smithy/is-array-buffer': 2.0.0 tslib: 2.6.2 + /@smithy/util-buffer-from@3.0.0: + resolution: {integrity: sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/is-array-buffer': 3.0.0 + tslib: 2.6.2 + /@smithy/util-config-provider@2.1.0: resolution: {integrity: sha512-S6V0JvvhQgFSGLcJeT1CBsaTR03MM8qTuxMH9WPCCddlSo2W0V5jIHimHtIQALMLEDPGQ0ROSRr/dU0O+mxiQg==} engines: {node: '>=14.0.0'} dependencies: tslib: 2.6.2 + /@smithy/util-config-provider@3.0.0: + resolution: {integrity: sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==} + engines: {node: '>=16.0.0'} + dependencies: + tslib: 2.6.2 + /@smithy/util-defaults-mode-browser@2.0.24: resolution: {integrity: sha512-TsP5mBuLgO2C21+laNG2nHYZEyUdkbGURv2tHvSuQQxLz952MegX95uwdxOY2jR2H4GoKuVRfdJq7w4eIjGYeg==} engines: {node: '>= 10.0.0'} @@ -8441,6 +9482,16 @@ packages: bowser: 2.11.0 tslib: 2.6.2 + /@smithy/util-defaults-mode-browser@3.0.15: + resolution: {integrity: sha512-FZ4Psa3vjp8kOXcd3HJOiDPBCWtiilLl57r0cnNtq/Ga9RSDrM5ERL6xt+tO43+2af6Pn5Yp92x2n5vPuduNfg==} + engines: {node: '>= 10.0.0'} + dependencies: + '@smithy/property-provider': 3.1.3 + '@smithy/smithy-client': 3.2.0 + '@smithy/types': 3.3.0 + bowser: 2.11.0 + tslib: 2.6.2 + /@smithy/util-defaults-mode-node@2.0.32: resolution: {integrity: sha512-d0S33dXA2cq1NyorVMroMrEtqKMr3MlyLITcfTBf9pXiigYiPMOtbSI7czHIfDbuVuM89Cg0urAgpt73QV9mPQ==} engines: {node: '>= 10.0.0'} @@ -8453,6 +9504,18 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/util-defaults-mode-node@3.0.15: + resolution: {integrity: sha512-KSyAAx2q6d0t6f/S4XB2+3+6aQacm3aLMhs9aLMqn18uYGUepbdssfogW5JQZpc6lXNBnp0tEnR5e9CEKmEd7A==} + engines: {node: '>= 10.0.0'} + dependencies: + '@smithy/config-resolver': 3.0.5 + '@smithy/credential-provider-imds': 3.2.0 + '@smithy/node-config-provider': 3.1.4 + '@smithy/property-provider': 3.1.3 + '@smithy/smithy-client': 3.2.0 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/util-endpoints@1.0.8: resolution: {integrity: sha512-l8zVuyZZ61IzZBYp5NWvsAhbaAjYkt0xg9R4xUASkg5SEeTT2meHOJwJHctKMFUXe4QZbn9fR2MaBYjP2119+w==} engines: {node: '>= 14.0.0'} @@ -8461,12 +9524,26 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/util-endpoints@2.0.5: + resolution: {integrity: sha512-ReQP0BWihIE68OAblC/WQmDD40Gx+QY1Ez8mTdFMXpmjfxSyz2fVQu3A4zXRfQU9sZXtewk3GmhfOHswvX+eNg==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/node-config-provider': 3.1.4 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/util-hex-encoding@2.0.0: resolution: {integrity: sha512-c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA==} engines: {node: '>=14.0.0'} dependencies: tslib: 2.6.2 + /@smithy/util-hex-encoding@3.0.0: + resolution: {integrity: sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==} + engines: {node: '>=16.0.0'} + dependencies: + tslib: 2.6.2 + /@smithy/util-middleware@2.0.9: resolution: {integrity: sha512-PnCnBJ07noMX1lMDTEefmxSlusWJUiLfrme++MfK5TD0xz8NYmakgoXy5zkF/16zKGmiwOeKAztWT/Vjk1KRIQ==} engines: {node: '>=14.0.0'} @@ -8474,6 +9551,13 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/util-middleware@3.0.3: + resolution: {integrity: sha512-l+StyYYK/eO3DlVPbU+4Bi06Jjal+PFLSMmlWM1BEwyLxZ3aKkf1ROnoIakfaA7mC6uw3ny7JBkau4Yc+5zfWw==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/util-retry@2.0.9: resolution: {integrity: sha512-46BFWe9RqB6g7f4mxm3W3HlqknqQQmWHKlhoqSFZuGNuiDU5KqmpebMbvC3tjTlUkqn4xa2Z7s3Hwb0HNs5scw==} engines: {node: '>= 14.0.0'} @@ -8482,6 +9566,14 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/util-retry@3.0.3: + resolution: {integrity: sha512-AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/service-error-classification': 3.0.3 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@smithy/util-stream@2.0.24: resolution: {integrity: sha512-hRpbcRrOxDriMVmbya+Mv77VZVupxRAsfxVDKS54XuiURhdiwCUXJP0X1iJhHinuUf6n8pBF0MkG9C8VooMnWw==} engines: {node: '>=14.0.0'} @@ -8495,12 +9587,31 @@ packages: '@smithy/util-utf8': 2.0.2 tslib: 2.6.2 + /@smithy/util-stream@3.1.3: + resolution: {integrity: sha512-FIv/bRhIlAxC0U7xM1BCnF2aDRPq0UaelqBHkM2lsCp26mcBbgI0tCVTv+jGdsQLUmAMybua/bjDsSu8RQHbmw==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/fetch-http-handler': 3.2.4 + '@smithy/node-http-handler': 3.1.4 + '@smithy/types': 3.3.0 + '@smithy/util-base64': 3.0.0 + '@smithy/util-buffer-from': 3.0.0 + '@smithy/util-hex-encoding': 3.0.0 + '@smithy/util-utf8': 3.0.0 + tslib: 2.6.2 + /@smithy/util-uri-escape@2.0.0: resolution: {integrity: sha512-ebkxsqinSdEooQduuk9CbKcI+wheijxEb3utGXkCoYQkJnwTnLbH1JXGimJtUkQwNQbsbuYwG2+aFVyZf5TLaw==} engines: {node: '>=14.0.0'} dependencies: tslib: 2.6.2 + /@smithy/util-uri-escape@3.0.0: + resolution: {integrity: sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==} + engines: {node: '>=16.0.0'} + dependencies: + tslib: 2.6.2 + /@smithy/util-utf8@2.0.2: resolution: {integrity: sha512-qOiVORSPm6Ce4/Yu6hbSgNHABLP2VMv8QOC3tTDNHHlWY19pPyc++fBTbZPtx6egPXi4HQxKDnMxVxpbtX2GoA==} engines: {node: '>=14.0.0'} @@ -8508,6 +9619,13 @@ packages: '@smithy/util-buffer-from': 2.0.0 tslib: 2.6.2 + /@smithy/util-utf8@3.0.0: + resolution: {integrity: sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/util-buffer-from': 3.0.0 + tslib: 2.6.2 + /@smithy/util-waiter@2.0.16: resolution: {integrity: sha512-5i4YONHQ6HoUWDd+X0frpxTXxSXgJhUFl+z0iMy/zpUmVeCQY2or3Vss6DzHKKMMQL4pmVHpQm9WayHDorFdZg==} engines: {node: '>=14.0.0'} @@ -8516,6 +9634,14 @@ packages: '@smithy/types': 2.8.0 tslib: 2.6.2 + /@smithy/util-waiter@3.1.2: + resolution: {integrity: sha512-4pP0EV3iTsexDx+8PPGAKCQpd/6hsQBaQhqWzU4hqKPHN5epPsxKbvUTIiYIHTxaKt6/kEaqPBpu/ufvfbrRzw==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/abort-controller': 3.1.1 + '@smithy/types': 3.3.0 + tslib: 2.6.2 + /@swc/helpers@0.4.11: resolution: {integrity: sha512-rEUrBSGIoSFuYxwBYtlUFMlE2CwGhmW+w9355/5oduSw8e5h2+Tj4UrAGNNgP9915++wj5vkQo0UuOBqOAq4nw==} dependencies: @@ -12372,6 +13498,31 @@ packages: - supports-color dev: true + /eslint-config-next@14.2.7(eslint@8.56.0)(typescript@4.9.5): + resolution: {integrity: sha512-ppmy+QdQ7qkuCHGDlPjWaoSbJvjGpWSBD4zEW8f1eWlxYXYpZK7QzBOer1EcHKT3uKhlY1JjUus9g7Kvv712rw==} + peerDependencies: + eslint: ^7.23.0 || ^8.0.0 + typescript: '>=3.3.1' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@next/eslint-plugin-next': 14.2.7 + '@rushstack/eslint-patch': 1.7.0 + '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@4.9.5) + eslint: 8.56.0 + eslint-import-resolver-node: 0.3.9 + eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.56.0) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0) + eslint-plugin-jsx-a11y: 6.8.0(eslint@8.56.0) + eslint-plugin-react: 7.33.2(eslint@8.56.0) + eslint-plugin-react-hooks: 4.6.0(eslint@8.56.0) + typescript: 4.9.5 + transitivePeerDependencies: + - eslint-import-resolver-webpack + - supports-color + dev: true + /eslint-config-prettier@8.10.0(eslint@8.56.0): resolution: {integrity: sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==} hasBin: true @@ -12999,6 +14150,12 @@ packages: dependencies: strnum: 1.0.5 + /fast-xml-parser@4.4.1: + resolution: {integrity: sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==} + hasBin: true + dependencies: + strnum: 1.0.5 + /fastest-levenshtein@1.0.16: resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==} engines: {node: '>= 4.9.1'} @@ -13237,7 +14394,6 @@ packages: dependencies: cross-spawn: 7.0.3 signal-exit: 4.1.0 - dev: false /forever-agent@0.6.1: resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==} @@ -13539,6 +14695,18 @@ packages: /glob-to-regexp@0.4.1: resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} + /glob@10.3.10: + resolution: {integrity: sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==} + engines: {node: '>=16 || 14 >=14.17'} + hasBin: true + dependencies: + foreground-child: 3.1.1 + jackspeak: 2.3.6 + minimatch: 9.0.3 + minipass: 7.0.4 + path-scurry: 1.11.1 + dev: true + /glob@10.3.15: resolution: {integrity: sha512-0c6RlJt1TICLyvJYIApxb8GsXoai0KUP7AxKKAtsYXdgJR1mGEUa7DgwShbdk1nly0PYoZj01xd4hzbq3fsjpw==} engines: {node: '>=16 || 14 >=14.18'} @@ -13731,21 +14899,23 @@ packages: - encoding dev: true - /graphql-tag@2.12.6(graphql@15.8.0): - resolution: {integrity: sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==} + /graphql-scalars@1.23.0(graphql@15.8.0): + resolution: {integrity: sha512-YTRNcwitkn8CqYcleKOx9IvedA8JIERn8BRq21nlKgOr4NEcTaWEG0sT+H92eF3ALTFbPgsqfft4cw+MGgv0Gg==} engines: {node: '>=10'} peerDependencies: - graphql: ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 + graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 dependencies: graphql: 15.8.0 tslib: 2.6.2 - /graphql-type-json@0.3.2(graphql@15.8.0): - resolution: {integrity: sha512-J+vjof74oMlCWXSvt0DOf2APEdZOCdubEvGDUAlqH//VBYcOYsGgRW7Xzorr44LvkjiuvecWc8fChxuZZbChtg==} + /graphql-tag@2.12.6(graphql@15.8.0): + resolution: {integrity: sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==} + engines: {node: '>=10'} peerDependencies: - graphql: '>=0.8.0' + graphql: ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 dependencies: graphql: 15.8.0 + tslib: 2.6.2 /graphql-ws@5.11.3(graphql@15.8.0): resolution: {integrity: sha512-fU8zwSgAX2noXAsuFiCZ8BtXeXZOzXyK5u1LloCdacsVth4skdBMPO74EG51lBoWSIZ8beUocdpV8+cQHBODnQ==} @@ -14046,6 +15216,15 @@ packages: - supports-color dev: true + /http-proxy-agent@7.0.2: + resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==} + engines: {node: '>= 14'} + dependencies: + agent-base: 7.1.0 + debug: 4.3.4(supports-color@9.4.0) + transitivePeerDependencies: + - supports-color + /http-proxy-middleware@2.0.6(@types/express@4.17.21): resolution: {integrity: sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==} engines: {node: '>=12.0.0'} @@ -14120,7 +15299,6 @@ packages: debug: 4.3.4(supports-color@9.4.0) transitivePeerDependencies: - supports-color - dev: false /human-id@1.0.2: resolution: {integrity: sha512-UNopramDEhHJD+VR+ehk8rOslwSfByxPIZyJRfV739NDhN5LF1fa1MqnzKm2lGTQRjNrjK19Q5fhkgIfjlVUKw==} @@ -14791,7 +15969,6 @@ packages: '@isaacs/cliui': 8.0.2 optionalDependencies: '@pkgjs/parseargs': 0.11.0 - dev: false /jest-changed-files@27.5.1: resolution: {integrity: sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==} @@ -17972,7 +19149,6 @@ packages: dependencies: lru-cache: 10.2.2 minipass: 7.0.4 - dev: false /path-to-regexp@0.1.7: resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==} @@ -19188,6 +20364,7 @@ packages: /rimraf@2.7.1: resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==} + deprecated: Rimraf versions prior to v4 are no longer supported hasBin: true dependencies: glob: 7.2.3 @@ -19494,7 +20671,6 @@ packages: /signal-exit@4.1.0: resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} engines: {node: '>=14'} - dev: false /signedsource@1.0.0: resolution: {integrity: sha512-6+eerH9fEnNmi/hyM1DXcRK3pWdoMQtlkQ+ns0ntzunjKqp5i3sKCc80ym8Fib3iaYhdJUOPdhlJWj1tvge2Ww==} @@ -21472,7 +22648,6 @@ packages: ansi-styles: 6.2.1 string-width: 5.1.2 strip-ansi: 7.1.0 - dev: false /wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} From b715f80c98c2d2017364ede0fbc05132fbad203e Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Sun, 1 Sep 2024 09:11:24 +0200 Subject: [PATCH 02/45] API: Remove unnecessary dependencies --- demo/api/package.json | 3 - packages/api/package.json | 3 - pnpm-lock.yaml | 1020 +------------------------------------ 3 files changed, 2 insertions(+), 1024 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index a02e3b4e..7ea74818 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -49,8 +49,6 @@ } }, "dependencies": { - "@aws-sdk/client-s3": "^3.49.0", - "@azure/storage-blob": "^12.0.0", "@comet/blocks-api": "^7.2.1", "@comet/brevo-api": "workspace:*", "@comet/cms-api": "^7.2.1", @@ -93,7 +91,6 @@ "node-cache": "^5.1.2", "node-fetch": "^2.6.1", "passport": "^0.4.0", - "pg-error-constants": "^1.0.0", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.2.0", diff --git a/packages/api/package.json b/packages/api/package.json index f3ca5c22..f211fcc0 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -36,8 +36,6 @@ "node-fetch": "^2.6.1" }, "devDependencies": { - "@aws-sdk/client-s3": "^3.47.0", - "@azure/storage-blob": "^12.0.0", "@comet/blocks-api": "^7.2.1", "@comet/cms-api": "^7.2.1", "@comet/eslint-config": "^7.2.1", @@ -66,7 +64,6 @@ "jest": "^29.5.0", "jest-junit": "^15.0.0", "nestjs-console": "^8.0.0", - "pg-error-constants": "^1.0.0", "prettier": "^2.0.0", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c7ee383b..c853c4b6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -279,12 +279,6 @@ importers: demo/api: dependencies: - '@aws-sdk/client-s3': - specifier: ^3.49.0 - version: 3.490.0 - '@azure/storage-blob': - specifier: ^12.0.0 - version: 12.17.0 '@comet/blocks-api': specifier: ^7.2.1 version: 7.2.1(@nestjs/common@9.4.3) @@ -411,9 +405,6 @@ importers: passport: specifier: ^0.4.0 version: 0.4.1 - pg-error-constants: - specifier: ^1.0.0 - version: 1.0.0 reflect-metadata: specifier: ^0.1.13 version: 0.1.14 @@ -962,12 +953,6 @@ importers: specifier: ^2.6.1 version: 2.7.0 devDependencies: - '@aws-sdk/client-s3': - specifier: ^3.47.0 - version: 3.490.0 - '@azure/storage-blob': - specifier: ^12.0.0 - version: 12.17.0 '@comet/blocks-api': specifier: ^7.2.1 version: 7.2.1(@nestjs/common@9.4.3) @@ -1052,9 +1037,6 @@ importers: nestjs-console: specifier: ^8.0.0 version: 8.0.0(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) - pg-error-constants: - specifier: ^1.0.0 - version: 1.0.0 prettier: specifier: ^2.0.0 version: 2.8.8 @@ -1349,13 +1331,6 @@ packages: - encoding dev: true - /@aws-crypto/crc32@3.0.0: - resolution: {integrity: sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==} - dependencies: - '@aws-crypto/util': 3.0.0 - '@aws-sdk/types': 3.489.0 - tslib: 1.14.1 - /@aws-crypto/crc32@5.2.0: resolution: {integrity: sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==} engines: {node: '>=16.0.0'} @@ -1364,13 +1339,6 @@ packages: '@aws-sdk/types': 3.609.0 tslib: 2.6.2 - /@aws-crypto/crc32c@3.0.0: - resolution: {integrity: sha512-ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w==} - dependencies: - '@aws-crypto/util': 3.0.0 - '@aws-sdk/types': 3.489.0 - tslib: 1.14.1 - /@aws-crypto/crc32c@5.2.0: resolution: {integrity: sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==} dependencies: @@ -1378,22 +1346,6 @@ packages: '@aws-sdk/types': 3.609.0 tslib: 2.6.2 - /@aws-crypto/ie11-detection@3.0.0: - resolution: {integrity: sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==} - dependencies: - tslib: 1.14.1 - - /@aws-crypto/sha1-browser@3.0.0: - resolution: {integrity: sha512-NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw==} - dependencies: - '@aws-crypto/ie11-detection': 3.0.0 - '@aws-crypto/supports-web-crypto': 3.0.0 - '@aws-crypto/util': 3.0.0 - '@aws-sdk/types': 3.489.0 - '@aws-sdk/util-locate-window': 3.465.0 - '@aws-sdk/util-utf8-browser': 3.259.0 - tslib: 1.14.1 - /@aws-crypto/sha1-browser@5.2.0: resolution: {integrity: sha512-OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==} dependencies: @@ -1404,18 +1356,6 @@ packages: '@smithy/util-utf8': 2.0.2 tslib: 2.6.2 - /@aws-crypto/sha256-browser@3.0.0: - resolution: {integrity: sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==} - dependencies: - '@aws-crypto/ie11-detection': 3.0.0 - '@aws-crypto/sha256-js': 3.0.0 - '@aws-crypto/supports-web-crypto': 3.0.0 - '@aws-crypto/util': 3.0.0 - '@aws-sdk/types': 3.489.0 - '@aws-sdk/util-locate-window': 3.465.0 - '@aws-sdk/util-utf8-browser': 3.259.0 - tslib: 1.14.1 - /@aws-crypto/sha256-browser@5.2.0: resolution: {integrity: sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==} dependencies: @@ -1427,13 +1367,6 @@ packages: '@smithy/util-utf8': 2.0.2 tslib: 2.6.2 - /@aws-crypto/sha256-js@3.0.0: - resolution: {integrity: sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==} - dependencies: - '@aws-crypto/util': 3.0.0 - '@aws-sdk/types': 3.489.0 - tslib: 1.14.1 - /@aws-crypto/sha256-js@5.2.0: resolution: {integrity: sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==} engines: {node: '>=16.0.0'} @@ -1442,23 +1375,11 @@ packages: '@aws-sdk/types': 3.609.0 tslib: 2.6.2 - /@aws-crypto/supports-web-crypto@3.0.0: - resolution: {integrity: sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==} - dependencies: - tslib: 1.14.1 - /@aws-crypto/supports-web-crypto@5.2.0: resolution: {integrity: sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==} dependencies: tslib: 2.6.2 - /@aws-crypto/util@3.0.0: - resolution: {integrity: sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==} - dependencies: - '@aws-sdk/types': 3.489.0 - '@aws-sdk/util-utf8-browser': 3.259.0 - tslib: 1.14.1 - /@aws-crypto/util@5.2.0: resolution: {integrity: sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==} dependencies: @@ -1466,71 +1387,6 @@ packages: '@smithy/util-utf8': 2.0.2 tslib: 2.6.2 - /@aws-sdk/client-s3@3.490.0: - resolution: {integrity: sha512-fBj3CJ3+5R+l/sc93Z9mKw8gM2b9K6vEhC9qSCG2XNymLd9YqlRft1peQ7VymrWywAHX3Koz1GCUrFEVNONiMw==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-crypto/sha1-browser': 3.0.0 - '@aws-crypto/sha256-browser': 3.0.0 - '@aws-crypto/sha256-js': 3.0.0 - '@aws-sdk/client-sts': 3.490.0 - '@aws-sdk/core': 3.490.0 - '@aws-sdk/credential-provider-node': 3.490.0 - '@aws-sdk/middleware-bucket-endpoint': 3.489.0 - '@aws-sdk/middleware-expect-continue': 3.489.0 - '@aws-sdk/middleware-flexible-checksums': 3.489.0 - '@aws-sdk/middleware-host-header': 3.489.0 - '@aws-sdk/middleware-location-constraint': 3.489.0 - '@aws-sdk/middleware-logger': 3.489.0 - '@aws-sdk/middleware-recursion-detection': 3.489.0 - '@aws-sdk/middleware-sdk-s3': 3.489.0 - '@aws-sdk/middleware-signing': 3.489.0 - '@aws-sdk/middleware-ssec': 3.489.0 - '@aws-sdk/middleware-user-agent': 3.489.0 - '@aws-sdk/region-config-resolver': 3.489.0 - '@aws-sdk/signature-v4-multi-region': 3.489.0 - '@aws-sdk/types': 3.489.0 - '@aws-sdk/util-endpoints': 3.489.0 - '@aws-sdk/util-user-agent-browser': 3.489.0 - '@aws-sdk/util-user-agent-node': 3.489.0 - '@aws-sdk/xml-builder': 3.485.0 - '@smithy/config-resolver': 2.0.23 - '@smithy/core': 1.2.2 - '@smithy/eventstream-serde-browser': 2.0.16 - '@smithy/eventstream-serde-config-resolver': 2.0.16 - '@smithy/eventstream-serde-node': 2.0.16 - '@smithy/fetch-http-handler': 2.3.2 - '@smithy/hash-blob-browser': 2.0.17 - '@smithy/hash-node': 2.0.18 - '@smithy/hash-stream-node': 2.0.18 - '@smithy/invalid-dependency': 2.0.16 - '@smithy/md5-js': 2.0.18 - '@smithy/middleware-content-length': 2.0.18 - '@smithy/middleware-endpoint': 2.3.0 - '@smithy/middleware-retry': 2.0.26 - '@smithy/middleware-serde': 2.0.16 - '@smithy/middleware-stack': 2.0.10 - '@smithy/node-config-provider': 2.1.9 - '@smithy/node-http-handler': 2.2.2 - '@smithy/protocol-http': 3.0.12 - '@smithy/smithy-client': 2.2.1 - '@smithy/types': 2.8.0 - '@smithy/url-parser': 2.0.16 - '@smithy/util-base64': 2.0.1 - '@smithy/util-body-length-browser': 2.0.1 - '@smithy/util-body-length-node': 2.1.0 - '@smithy/util-defaults-mode-browser': 2.0.24 - '@smithy/util-defaults-mode-node': 2.0.32 - '@smithy/util-endpoints': 1.0.8 - '@smithy/util-retry': 2.0.9 - '@smithy/util-stream': 2.0.24 - '@smithy/util-utf8': 2.0.2 - '@smithy/util-waiter': 2.0.16 - fast-xml-parser: 4.2.5 - tslib: 2.6.2 - transitivePeerDependencies: - - aws-crt - /@aws-sdk/client-s3@3.637.0: resolution: {integrity: sha512-y6UC94fsMvhKbf0dzfnjVP1HePeGjplfcYfilZU1COIJLyTkMcUv4XcT4I407CGIrvgEafONHkiC09ygqUauNA==} engines: {node: '>=16.0.0'} @@ -1645,50 +1501,6 @@ packages: transitivePeerDependencies: - aws-crt - /@aws-sdk/client-sso@3.490.0: - resolution: {integrity: sha512-yfxoHmCL1w/IKmFRfzCxdVCQrGlSQf4eei9iVEm5oi3iE8REFyPj3o/BmKQEHG3h2ITK5UbdYDb5TY4xoYHsyA==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-crypto/sha256-browser': 3.0.0 - '@aws-crypto/sha256-js': 3.0.0 - '@aws-sdk/core': 3.490.0 - '@aws-sdk/middleware-host-header': 3.489.0 - '@aws-sdk/middleware-logger': 3.489.0 - '@aws-sdk/middleware-recursion-detection': 3.489.0 - '@aws-sdk/middleware-user-agent': 3.489.0 - '@aws-sdk/region-config-resolver': 3.489.0 - '@aws-sdk/types': 3.489.0 - '@aws-sdk/util-endpoints': 3.489.0 - '@aws-sdk/util-user-agent-browser': 3.489.0 - '@aws-sdk/util-user-agent-node': 3.489.0 - '@smithy/config-resolver': 2.0.23 - '@smithy/core': 1.2.2 - '@smithy/fetch-http-handler': 2.3.2 - '@smithy/hash-node': 2.0.18 - '@smithy/invalid-dependency': 2.0.16 - '@smithy/middleware-content-length': 2.0.18 - '@smithy/middleware-endpoint': 2.3.0 - '@smithy/middleware-retry': 2.0.26 - '@smithy/middleware-serde': 2.0.16 - '@smithy/middleware-stack': 2.0.10 - '@smithy/node-config-provider': 2.1.9 - '@smithy/node-http-handler': 2.2.2 - '@smithy/protocol-http': 3.0.12 - '@smithy/smithy-client': 2.2.1 - '@smithy/types': 2.8.0 - '@smithy/url-parser': 2.0.16 - '@smithy/util-base64': 2.0.1 - '@smithy/util-body-length-browser': 2.0.1 - '@smithy/util-body-length-node': 2.1.0 - '@smithy/util-defaults-mode-browser': 2.0.24 - '@smithy/util-defaults-mode-node': 2.0.32 - '@smithy/util-endpoints': 1.0.8 - '@smithy/util-retry': 2.0.9 - '@smithy/util-utf8': 2.0.2 - tslib: 2.6.2 - transitivePeerDependencies: - - aws-crt - /@aws-sdk/client-sso@3.637.0: resolution: {integrity: sha512-+KjLvgX5yJYROWo3TQuwBJlHCY0zz9PsLuEolmXQn0BVK1L/m9GteZHtd+rEdAoDGBpE0Xqjy1oz5+SmtsaRUw==} engines: {node: '>=16.0.0'} @@ -1734,53 +1546,6 @@ packages: transitivePeerDependencies: - aws-crt - /@aws-sdk/client-sts@3.490.0: - resolution: {integrity: sha512-n2vQ5Qu2qi2I0XMI+IH99ElpIRHOJTa1+sqNC4juMYxKQBMvw+EnsqUtaL3QvTHoyxNB/R7mpkeBB6SzPQ1TtA==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-crypto/sha256-browser': 3.0.0 - '@aws-crypto/sha256-js': 3.0.0 - '@aws-sdk/core': 3.490.0 - '@aws-sdk/credential-provider-node': 3.490.0 - '@aws-sdk/middleware-host-header': 3.489.0 - '@aws-sdk/middleware-logger': 3.489.0 - '@aws-sdk/middleware-recursion-detection': 3.489.0 - '@aws-sdk/middleware-user-agent': 3.489.0 - '@aws-sdk/region-config-resolver': 3.489.0 - '@aws-sdk/types': 3.489.0 - '@aws-sdk/util-endpoints': 3.489.0 - '@aws-sdk/util-user-agent-browser': 3.489.0 - '@aws-sdk/util-user-agent-node': 3.489.0 - '@smithy/config-resolver': 2.0.23 - '@smithy/core': 1.2.2 - '@smithy/fetch-http-handler': 2.3.2 - '@smithy/hash-node': 2.0.18 - '@smithy/invalid-dependency': 2.0.16 - '@smithy/middleware-content-length': 2.0.18 - '@smithy/middleware-endpoint': 2.3.0 - '@smithy/middleware-retry': 2.0.26 - '@smithy/middleware-serde': 2.0.16 - '@smithy/middleware-stack': 2.0.10 - '@smithy/node-config-provider': 2.1.9 - '@smithy/node-http-handler': 2.2.2 - '@smithy/protocol-http': 3.0.12 - '@smithy/smithy-client': 2.2.1 - '@smithy/types': 2.8.0 - '@smithy/url-parser': 2.0.16 - '@smithy/util-base64': 2.0.1 - '@smithy/util-body-length-browser': 2.0.1 - '@smithy/util-body-length-node': 2.1.0 - '@smithy/util-defaults-mode-browser': 2.0.24 - '@smithy/util-defaults-mode-node': 2.0.32 - '@smithy/util-endpoints': 1.0.8 - '@smithy/util-middleware': 2.0.9 - '@smithy/util-retry': 2.0.9 - '@smithy/util-utf8': 2.0.2 - fast-xml-parser: 4.2.5 - tslib: 2.6.2 - transitivePeerDependencies: - - aws-crt - /@aws-sdk/client-sts@3.637.0: resolution: {integrity: sha512-xUi7x4qDubtA8QREtlblPuAcn91GS/09YVEY/RwU7xCY0aqGuFwgszAANlha4OUIqva8oVj2WO4gJuG+iaSnhw==} engines: {node: '>=16.0.0'} @@ -1828,17 +1593,6 @@ packages: transitivePeerDependencies: - aws-crt - /@aws-sdk/core@3.490.0: - resolution: {integrity: sha512-TSBWkXtxMU7q1Zo6w3v5wIOr/sj7P5Jw3OyO7lJrFGsPsDC2xwpxkVqTesDxkzgMRypO52xjYEmveagn1xxBHg==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/core': 1.2.2 - '@smithy/protocol-http': 3.0.12 - '@smithy/signature-v4': 2.0.19 - '@smithy/smithy-client': 2.2.1 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@aws-sdk/core@3.635.0: resolution: {integrity: sha512-i1x/E/sgA+liUE1XJ7rj1dhyXpAKO1UKFUcTTHXok2ARjWTvszHnSXMOsB77aPbmn0fUp1JTx2kHUAZ1LVt5Bg==} engines: {node: '>=16.0.0'} @@ -1854,15 +1608,6 @@ packages: fast-xml-parser: 4.4.1 tslib: 2.6.2 - /@aws-sdk/credential-provider-env@3.489.0: - resolution: {integrity: sha512-5PqYsx9G5SB2tqPT9/z/u0EkF6D4wP6HTMWQs+DfMdmwXihrqQAgeYaTtV3KbXqb88p6sfacwxhUvE6+Rm494w==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/property-provider': 2.0.17 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@aws-sdk/credential-provider-env@3.620.1: resolution: {integrity: sha512-ExuILJ2qLW5ZO+rgkNRj0xiAipKT16Rk77buvPP8csR7kkCflT/gXTyzRe/uzIiETTxM7tr8xuO9MP/DQXqkfg==} engines: {node: '>=16.0.0'} @@ -1886,23 +1631,6 @@ packages: '@smithy/util-stream': 3.1.3 tslib: 2.6.2 - /@aws-sdk/credential-provider-ini@3.490.0: - resolution: {integrity: sha512-7m63zyCpVqj9FsoDxWMWWRvL6c7zZzOcXYkHZmHujVVlmAXH0RT/vkXFkYgt+Ku+ov+v5NQrzwO5TmVoRt6O8g==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-sdk/credential-provider-env': 3.489.0 - '@aws-sdk/credential-provider-process': 3.489.0 - '@aws-sdk/credential-provider-sso': 3.490.0 - '@aws-sdk/credential-provider-web-identity': 3.489.0 - '@aws-sdk/types': 3.489.0 - '@smithy/credential-provider-imds': 2.1.5 - '@smithy/property-provider': 2.0.17 - '@smithy/shared-ini-file-loader': 2.2.8 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - transitivePeerDependencies: - - aws-crt - /@aws-sdk/credential-provider-ini@3.637.0(@aws-sdk/client-sso-oidc@3.637.0)(@aws-sdk/client-sts@3.637.0): resolution: {integrity: sha512-h+PFCWfZ0Q3Dx84SppET/TFpcQHmxFW8/oV9ArEvMilw4EBN+IlxgbL0CnHwjHW64szcmrM0mbebjEfHf4FXmw==} engines: {node: '>=16.0.0'} @@ -1925,24 +1653,6 @@ packages: - '@aws-sdk/client-sso-oidc' - aws-crt - /@aws-sdk/credential-provider-node@3.490.0: - resolution: {integrity: sha512-Gh33u2O5Xbout8G3z/Z5H/CZzdG1ophxf/XS3iMFxA1cazQ7swY1UMmGvB7Lm7upvax5anXouItD1Ph3gzKc4w==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-sdk/credential-provider-env': 3.489.0 - '@aws-sdk/credential-provider-ini': 3.490.0 - '@aws-sdk/credential-provider-process': 3.489.0 - '@aws-sdk/credential-provider-sso': 3.490.0 - '@aws-sdk/credential-provider-web-identity': 3.489.0 - '@aws-sdk/types': 3.489.0 - '@smithy/credential-provider-imds': 2.1.5 - '@smithy/property-provider': 2.0.17 - '@smithy/shared-ini-file-loader': 2.2.8 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - transitivePeerDependencies: - - aws-crt - /@aws-sdk/credential-provider-node@3.637.0(@aws-sdk/client-sso-oidc@3.637.0)(@aws-sdk/client-sts@3.637.0): resolution: {integrity: sha512-yoEhoxJJfs7sPVQ6Is939BDQJZpZCoUgKr/ySse4YKOZ24t4VqgHA6+wV7rYh+7IW24Rd91UTvEzSuHYTlxlNA==} engines: {node: '>=16.0.0'} @@ -1964,16 +1674,6 @@ packages: - '@aws-sdk/client-sts' - aws-crt - /@aws-sdk/credential-provider-process@3.489.0: - resolution: {integrity: sha512-3vKQYJZ5cZYjy0870CPmbmKRBgATw2xCygxhn4m4UDCjOXVXcGUtYD51DMWsvBo3S0W8kH+FIJV4yuEDMFqLFQ==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/property-provider': 2.0.17 - '@smithy/shared-ini-file-loader': 2.2.8 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@aws-sdk/credential-provider-process@3.620.1: resolution: {integrity: sha512-hWqFMidqLAkaV9G460+1at6qa9vySbjQKKc04p59OT7lZ5cO5VH5S4aI05e+m4j364MBROjjk2ugNvfNf/8ILg==} engines: {node: '>=16.0.0'} @@ -1984,20 +1684,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@aws-sdk/credential-provider-sso@3.490.0: - resolution: {integrity: sha512-3UUBUoPbFvT58IhS4Vb23omYj/QPNkjgxu9p9ruQ3KSjLkanI4w8t/l/jljA65q83P7CoLnM5UKG9L7RA8/V1Q==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-sdk/client-sso': 3.490.0 - '@aws-sdk/token-providers': 3.489.0 - '@aws-sdk/types': 3.489.0 - '@smithy/property-provider': 2.0.17 - '@smithy/shared-ini-file-loader': 2.2.8 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - transitivePeerDependencies: - - aws-crt - /@aws-sdk/credential-provider-sso@3.637.0(@aws-sdk/client-sso-oidc@3.637.0): resolution: {integrity: sha512-Mvz+h+e62/tl+dVikLafhv+qkZJ9RUb8l2YN/LeKMWkxQylPT83CPk9aimVhCV89zth1zpREArl97+3xsfgQvA==} engines: {node: '>=16.0.0'} @@ -2013,15 +1699,6 @@ packages: - '@aws-sdk/client-sso-oidc' - aws-crt - /@aws-sdk/credential-provider-web-identity@3.489.0: - resolution: {integrity: sha512-mjIuE2Wg1H/ds0nXQ/7vfusEDudmdd8YzKZI1y5O4n60iZZtyB2RNIECtvLMx1EQAKclidY7/06qQkArrGau5Q==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/property-provider': 2.0.17 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@aws-sdk/credential-provider-web-identity@3.621.0(@aws-sdk/client-sts@3.637.0): resolution: {integrity: sha512-w7ASSyfNvcx7+bYGep3VBgC3K6vEdLmlpjT7nSIHxxQf+WSdvy+HynwJosrpZax0sK5q0D1Jpn/5q+r5lwwW6w==} engines: {node: '>=16.0.0'} @@ -2034,18 +1711,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@aws-sdk/middleware-bucket-endpoint@3.489.0: - resolution: {integrity: sha512-6rJ5bpNMKo7sEKQ6p2DMbQwM+ahMYASRxfdyH7hs18blvlcS20H1RYpNmJMqPPjxMwUWruty2JPMIRl4DFcv8w==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-sdk/types': 3.489.0 - '@aws-sdk/util-arn-parser': 3.465.0 - '@smithy/node-config-provider': 2.1.9 - '@smithy/protocol-http': 3.0.12 - '@smithy/types': 2.8.0 - '@smithy/util-config-provider': 2.1.0 - tslib: 2.6.2 - /@aws-sdk/middleware-bucket-endpoint@3.620.0: resolution: {integrity: sha512-eGLL0W6L3HDb3OACyetZYOWpHJ+gLo0TehQKeQyy2G8vTYXqNTeqYhuI6up9HVjBzU9eQiULVQETmgQs7TFaRg==} engines: {node: '>=16.0.0'} @@ -2058,15 +1723,6 @@ packages: '@smithy/util-config-provider': 3.0.0 tslib: 2.6.2 - /@aws-sdk/middleware-expect-continue@3.489.0: - resolution: {integrity: sha512-2RZfnVZFaGHwzPDQJsyf9SXufu1gUd4VsMhm7dC7SWF85XmpDrozbFznS/tD22QdtyWjerLoydZJMq229hpPqg==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/protocol-http': 3.0.12 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@aws-sdk/middleware-expect-continue@3.620.0: resolution: {integrity: sha512-QXeRFMLfyQ31nAHLbiTLtk0oHzG9QLMaof5jIfqcUwnOkO8YnQdeqzakrg1Alpy/VQ7aqzIi8qypkBe2KXZz0A==} engines: {node: '>=16.0.0'} @@ -2076,19 +1732,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@aws-sdk/middleware-flexible-checksums@3.489.0: - resolution: {integrity: sha512-Cy3rBUMr4P7raxzrJFWNRshfKrKV2EojawaC9Bfk/T8aFlV+FmVrRg4ISAXMOfS5pfy3xfAbvkzjOaeqCsGfrA==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-crypto/crc32': 3.0.0 - '@aws-crypto/crc32c': 3.0.0 - '@aws-sdk/types': 3.489.0 - '@smithy/is-array-buffer': 2.0.0 - '@smithy/protocol-http': 3.0.12 - '@smithy/types': 2.8.0 - '@smithy/util-utf8': 2.0.2 - tslib: 2.6.2 - /@aws-sdk/middleware-flexible-checksums@3.620.0: resolution: {integrity: sha512-ftz+NW7qka2sVuwnnO1IzBku5ccP+s5qZGeRTPgrKB7OzRW85gthvIo1vQR2w+OwHFk7WJbbhhWwbCbktnP4UA==} engines: {node: '>=16.0.0'} @@ -2102,15 +1745,6 @@ packages: '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 - /@aws-sdk/middleware-host-header@3.489.0: - resolution: {integrity: sha512-Cl7HJ1jhOfllwf0CRx1eB4ypRGMqdGKWpc0eSTXty7wWSvCdMZUhwfjQqu2bIOIlgYxg/gFu6TVmVZ6g4O8PlA==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/protocol-http': 3.0.12 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@aws-sdk/middleware-host-header@3.620.0: resolution: {integrity: sha512-VMtPEZwqYrII/oUkffYsNWY9PZ9xpNJpMgmyU0rlDQ25O1c0Hk3fJmZRe6pEkAJ0omD7kLrqGl1DUjQVxpd/Rg==} engines: {node: '>=16.0.0'} @@ -2120,14 +1754,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@aws-sdk/middleware-location-constraint@3.489.0: - resolution: {integrity: sha512-NIVr+kHR2N6gxFeE3TNw2mEBxgj0N9xXBLy3dNYMMlAUvQlT/0z9HlC9+3XqcTS/Z5ElF/+pei6nqXTVt0He9A==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@aws-sdk/middleware-location-constraint@3.609.0: resolution: {integrity: sha512-xzsdoTkszGVqGVPjUmgoP7TORiByLueMHieI1fhQL888WPdqctwAx3ES6d/bA9Q/i8jnc6hs+Fjhy8UvBTkE9A==} engines: {node: '>=16.0.0'} @@ -2136,14 +1762,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@aws-sdk/middleware-logger@3.489.0: - resolution: {integrity: sha512-+EVDnWese61MdImcBNAgz/AhTcIZJaska/xsU3GWU9CP905x4a4qZdB7fExFMDu1Jlz5pJqNteFYYHCFMJhHfg==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@aws-sdk/middleware-logger@3.609.0: resolution: {integrity: sha512-S62U2dy4jMDhDFDK5gZ4VxFdWzCtLzwbYyFZx2uvPYTECkepLUfzLic2BHg2Qvtu4QjX+oGE3P/7fwaGIsGNuQ==} engines: {node: '>=16.0.0'} @@ -2152,15 +1770,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@aws-sdk/middleware-recursion-detection@3.489.0: - resolution: {integrity: sha512-m4rU+fTzziQcu9DKjRNZ4nQlXENEd2ZnJblJV4ONdWqqEjbmOgOj3P6aCCQlJdIbzuNvX1FBOZ5tY59ZpERo7Q==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/protocol-http': 3.0.12 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@aws-sdk/middleware-recursion-detection@3.620.0: resolution: {integrity: sha512-nh91S7aGK3e/o1ck64sA/CyoFw+gAYj2BDOnoNa6ouyCrVJED96ZXWbhye/fz9SgmNUZR2g7GdVpiLpMKZoI5w==} engines: {node: '>=16.0.0'} @@ -2170,20 +1779,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@aws-sdk/middleware-sdk-s3@3.489.0: - resolution: {integrity: sha512-/GGASx7mK9qEgy1znvleYMZKVqm3sOdGghqKdy2zgoGcH2jH+fZrLM0lDMT9bvdITmOCbJJs2rVHP3xm/ZWcXg==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-sdk/types': 3.489.0 - '@aws-sdk/util-arn-parser': 3.465.0 - '@smithy/node-config-provider': 2.1.9 - '@smithy/protocol-http': 3.0.12 - '@smithy/signature-v4': 2.0.19 - '@smithy/smithy-client': 2.2.1 - '@smithy/types': 2.8.0 - '@smithy/util-config-provider': 2.1.0 - tslib: 2.6.2 - /@aws-sdk/middleware-sdk-s3@3.635.0: resolution: {integrity: sha512-RLdYJPEV4JL/7NBoFUs7VlP90X++5FlJdxHz0DzCjmiD3qCviKy+Cym3qg1gBgHwucs5XisuClxDrGokhAdTQw==} engines: {node: '>=16.0.0'} @@ -2203,26 +1798,6 @@ packages: '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 - /@aws-sdk/middleware-signing@3.489.0: - resolution: {integrity: sha512-rlHcWYZn6Ym3v/u0DvKNDiD7ogIzEsHlerm0lowTiQbszkFobOiUClRTALwvsUZdAAztl706qO1OKbnGnD6Ubw==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/property-provider': 2.0.17 - '@smithy/protocol-http': 3.0.12 - '@smithy/signature-v4': 2.0.19 - '@smithy/types': 2.8.0 - '@smithy/util-middleware': 2.0.9 - tslib: 2.6.2 - - /@aws-sdk/middleware-ssec@3.489.0: - resolution: {integrity: sha512-5RQg8dqERAmi1OfVEV9fbTA5NKmcvKDYP79YtH08IEFIsHWU1Y5NoqL7mXkkNyBrJNBVyasYijAbTzOuM707eg==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@aws-sdk/middleware-ssec@3.609.0: resolution: {integrity: sha512-GZSD1s7+JswWOTamVap79QiDaIV7byJFssBW68GYjyRS5EBjNfwA/8s+6uE6g39R3ojyTbYOmvcANoZEhSULXg==} engines: {node: '>=16.0.0'} @@ -2231,16 +1806,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@aws-sdk/middleware-user-agent@3.489.0: - resolution: {integrity: sha512-M54Cv2fAN3GGgdfUjLtZ4wFUIrfM/ivbXv4DgpcNsacEQ2g4H+weQgKp41X7XZW8MWAzl+k1zJaryK69RYNQkQ==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-sdk/types': 3.489.0 - '@aws-sdk/util-endpoints': 3.489.0 - '@smithy/protocol-http': 3.0.12 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@aws-sdk/middleware-user-agent@3.637.0: resolution: {integrity: sha512-EYo0NE9/da/OY8STDsK2LvM4kNa79DBsf4YVtaG4P5pZ615IeFsD8xOHZeuJmUrSMlVQ8ywPRX7WMucUybsKug==} engines: {node: '>=16.0.0'} @@ -2251,17 +1816,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@aws-sdk/region-config-resolver@3.489.0: - resolution: {integrity: sha512-UvrnB78XTz9ddby7mr0vuUHn2MO3VTjzaIu+GQhyedMGQU0QlIQrYOlzbbu4LC5rL1O8FxFLUxRe/AAjgwyuGw==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/node-config-provider': 2.1.9 - '@smithy/types': 2.8.0 - '@smithy/util-config-provider': 2.1.0 - '@smithy/util-middleware': 2.0.9 - tslib: 2.6.2 - /@aws-sdk/region-config-resolver@3.614.0: resolution: {integrity: sha512-vDCeMXvic/LU0KFIUjpC3RiSTIkkvESsEfbVHiHH0YINfl8HnEqR5rj+L8+phsCeVg2+LmYwYxd5NRz4PHxt5g==} engines: {node: '>=16.0.0'} @@ -2273,17 +1827,6 @@ packages: '@smithy/util-middleware': 3.0.3 tslib: 2.6.2 - /@aws-sdk/signature-v4-multi-region@3.489.0: - resolution: {integrity: sha512-kYFM7Opu36EkFlzXdVNOBFpQApgnuaTu/U/qYhGyuzeD+HNnYgZEsd/tDro1DQ074jVy3GN9ttJSYxq5I4oTkA==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-sdk/middleware-sdk-s3': 3.489.0 - '@aws-sdk/types': 3.489.0 - '@smithy/protocol-http': 3.0.12 - '@smithy/signature-v4': 2.0.19 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@aws-sdk/signature-v4-multi-region@3.635.0: resolution: {integrity: sha512-J6QY4/invOkpogCHjSaDON1hF03viPpOnsrzVuCvJMmclS/iG62R4EY0wq1alYll0YmSdmKlpJwHMWwGtqK63Q==} engines: {node: '>=16.0.0'} @@ -2295,50 +1838,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@aws-sdk/token-providers@3.489.0: - resolution: {integrity: sha512-hSgjB8CMQoA8EIQ0ripDjDtbBcWDSa+7vSBYPIzksyknaGERR/GUfGXLV2dpm5t17FgFG6irT5f3ZlBzarL8Dw==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-crypto/sha256-browser': 3.0.0 - '@aws-crypto/sha256-js': 3.0.0 - '@aws-sdk/middleware-host-header': 3.489.0 - '@aws-sdk/middleware-logger': 3.489.0 - '@aws-sdk/middleware-recursion-detection': 3.489.0 - '@aws-sdk/middleware-user-agent': 3.489.0 - '@aws-sdk/region-config-resolver': 3.489.0 - '@aws-sdk/types': 3.489.0 - '@aws-sdk/util-endpoints': 3.489.0 - '@aws-sdk/util-user-agent-browser': 3.489.0 - '@aws-sdk/util-user-agent-node': 3.489.0 - '@smithy/config-resolver': 2.0.23 - '@smithy/fetch-http-handler': 2.3.2 - '@smithy/hash-node': 2.0.18 - '@smithy/invalid-dependency': 2.0.16 - '@smithy/middleware-content-length': 2.0.18 - '@smithy/middleware-endpoint': 2.3.0 - '@smithy/middleware-retry': 2.0.26 - '@smithy/middleware-serde': 2.0.16 - '@smithy/middleware-stack': 2.0.10 - '@smithy/node-config-provider': 2.1.9 - '@smithy/node-http-handler': 2.2.2 - '@smithy/property-provider': 2.0.17 - '@smithy/protocol-http': 3.0.12 - '@smithy/shared-ini-file-loader': 2.2.8 - '@smithy/smithy-client': 2.2.1 - '@smithy/types': 2.8.0 - '@smithy/url-parser': 2.0.16 - '@smithy/util-base64': 2.0.1 - '@smithy/util-body-length-browser': 2.0.1 - '@smithy/util-body-length-node': 2.1.0 - '@smithy/util-defaults-mode-browser': 2.0.24 - '@smithy/util-defaults-mode-node': 2.0.32 - '@smithy/util-endpoints': 1.0.8 - '@smithy/util-retry': 2.0.9 - '@smithy/util-utf8': 2.0.2 - tslib: 2.6.2 - transitivePeerDependencies: - - aws-crt - /@aws-sdk/token-providers@3.614.0(@aws-sdk/client-sso-oidc@3.637.0): resolution: {integrity: sha512-okItqyY6L9IHdxqs+Z116y5/nda7rHxLvROxtAJdLavWTYDydxrZstImNgGWTeVdmc0xX2gJCI77UYUTQWnhRw==} engines: {node: '>=16.0.0'} @@ -2352,13 +1851,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@aws-sdk/types@3.489.0: - resolution: {integrity: sha512-kcDtLfKog/p0tC4gAeqJqWxAiEzfe2LRPnKamvSG2Mjbthx4R/alE2dxyIq/wW+nvRv0fqR3OD5kD1+eVfdr/w==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@aws-sdk/types@3.609.0: resolution: {integrity: sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==} engines: {node: '>=16.0.0'} @@ -2366,27 +1858,12 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@aws-sdk/util-arn-parser@3.465.0: - resolution: {integrity: sha512-zOJ82vzDJFqBX9yZBlNeHHrul/kpx/DCoxzW5UBbZeb26kfV53QhMSoEmY8/lEbBqlqargJ/sgRC845GFhHNQw==} - engines: {node: '>=14.0.0'} - dependencies: - tslib: 2.6.2 - /@aws-sdk/util-arn-parser@3.568.0: resolution: {integrity: sha512-XUKJWWo+KOB7fbnPP0+g/o5Ulku/X53t7i/h+sPHr5xxYTJJ9CYnbToo95mzxe7xWvkLrsNtJ8L+MnNn9INs2w==} engines: {node: '>=16.0.0'} dependencies: tslib: 2.6.2 - /@aws-sdk/util-endpoints@3.489.0: - resolution: {integrity: sha512-uGyG1u84ATX03mf7bT4xD9XD/vlYJGD5+RxMN/UpzeTfzXfh+jvCQWbOQ44z8ttFJWYQQqrLxkfpF/JgvALzLA==} - engines: {node: '>=14.0.0'} - dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/types': 2.8.0 - '@smithy/util-endpoints': 1.0.8 - tslib: 2.6.2 - /@aws-sdk/util-endpoints@3.637.0: resolution: {integrity: sha512-pAqOKUHeVWHEXXDIp/qoMk/6jyxIb6GGjnK1/f8dKHtKIEs4tKsnnL563gceEvdad53OPXIt86uoevCcCzmBnw==} engines: {node: '>=16.0.0'} @@ -2402,14 +1879,6 @@ packages: dependencies: tslib: 2.6.2 - /@aws-sdk/util-user-agent-browser@3.489.0: - resolution: {integrity: sha512-85B9KMsuMpAZauzWQ16r52ZBAHYnznW6BVitnBglsibN7oJKn10Hggt4QGuRhvQFCxQ8YhvBl7r+vQGFO4hxIw==} - dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/types': 2.8.0 - bowser: 2.11.0 - tslib: 2.6.2 - /@aws-sdk/util-user-agent-browser@3.609.0: resolution: {integrity: sha512-fojPU+mNahzQ0YHYBsx0ZIhmMA96H+ZIZ665ObU9tl+SGdbLneVZVikGve+NmHTQwHzwkFsZYYnVKAkreJLAtA==} dependencies: @@ -2418,20 +1887,6 @@ packages: bowser: 2.11.0 tslib: 2.6.2 - /@aws-sdk/util-user-agent-node@3.489.0: - resolution: {integrity: sha512-CYdkBHig8sFNc0dv11Ni9WXvZQHeI5+z77OrDHKkbidFx/V4BDTuwZw4K1vWg62pzFOEfzunJFiULRcDZWJR3w==} - engines: {node: '>=14.0.0'} - peerDependencies: - aws-crt: '>=1.0.0' - peerDependenciesMeta: - aws-crt: - optional: true - dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/node-config-provider': 2.1.9 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@aws-sdk/util-user-agent-node@3.614.0: resolution: {integrity: sha512-15ElZT88peoHnq5TEoEtZwoXTXRxNrk60TZNdpl/TUBJ5oNJ9Dqb5Z4ryb8ofN6nm9aFf59GVAerFDz8iUoHBA==} engines: {node: '>=16.0.0'} @@ -2446,18 +1901,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@aws-sdk/util-utf8-browser@3.259.0: - resolution: {integrity: sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==} - dependencies: - tslib: 2.6.2 - - /@aws-sdk/xml-builder@3.485.0: - resolution: {integrity: sha512-xQexPM6LINOIkf3NLFywplcbApifZRMWFN41TDWYSNgCUa5uC9fntfenw8N/HTx1n+McRCWSAFBTjDqY/2OLCQ==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@aws-sdk/xml-builder@3.609.0: resolution: {integrity: sha512-l9XxNcA4HX98rwCC2/KoiWcmEiRfZe4G+mYwDbCFT87JIMj6GBhLDkAzr/W8KAaA2IDr8Vc6J8fZPgVulxxfMA==} engines: {node: '>=16.0.0'} @@ -2534,27 +1977,6 @@ packages: transitivePeerDependencies: - supports-color - /@azure/core-http@3.0.4: - resolution: {integrity: sha512-Fok9VVhMdxAFOtqiiAtg74fL0UJkt0z3D+ouUUxcRLzZNBioPRAMJFVxiWoJljYpXsRi4GDQHzQHDc9AiYaIUQ==} - engines: {node: '>=14.0.0'} - dependencies: - '@azure/abort-controller': 1.1.0 - '@azure/core-auth': 1.5.0 - '@azure/core-tracing': 1.0.0-preview.13 - '@azure/core-util': 1.6.1 - '@azure/logger': 1.0.4 - '@types/node-fetch': 2.6.11 - '@types/tunnel': 0.0.3 - form-data: 4.0.0 - node-fetch: 2.7.0 - process: 0.11.10 - tslib: 2.6.2 - tunnel: 0.0.6 - uuid: 8.3.2 - xml2js: 0.5.0 - transitivePeerDependencies: - - encoding - /@azure/core-lro@2.5.4: resolution: {integrity: sha512-3GJiMVH7/10bulzOKGrrLeG/uCBH/9VtxqaMcB9lIqAeamI/xYQSHJL/KcsLDuH+yTjYpro/u6D/MuRe4dN70Q==} engines: {node: '>=14.0.0'} @@ -2591,13 +2013,6 @@ packages: dependencies: tslib: 2.6.2 - /@azure/core-tracing@1.0.0-preview.13: - resolution: {integrity: sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==} - engines: {node: '>=12.0.0'} - dependencies: - '@opentelemetry/api': 1.7.0 - tslib: 2.6.2 - /@azure/core-tracing@1.1.2: resolution: {integrity: sha512-dawW9ifvWAWmUm9/h+/UQ2jrdvjCJ7VJEuCJ6XVNudzcOwm53BFZH4Q845vjfgoUAM8ZxokvVNxNxAITc502YA==} engines: {node: '>=18.0.0'} @@ -2645,21 +2060,6 @@ packages: transitivePeerDependencies: - supports-color - /@azure/storage-blob@12.17.0: - resolution: {integrity: sha512-sM4vpsCpcCApagRW5UIjQNlNylo02my2opgp0Emi8x888hZUvJ3dN69Oq20cEGXkMUWnoCrBaB0zyS3yeB87sQ==} - engines: {node: '>=14.0.0'} - dependencies: - '@azure/abort-controller': 1.1.0 - '@azure/core-http': 3.0.4 - '@azure/core-lro': 2.5.4 - '@azure/core-paging': 1.5.0 - '@azure/core-tracing': 1.0.0-preview.13 - '@azure/logger': 1.0.4 - events: 3.3.0 - tslib: 2.6.2 - transitivePeerDependencies: - - encoding - /@azure/storage-blob@12.24.0: resolution: {integrity: sha512-l8cmWM4C7RoNCBOImoFMxhTXe1Lr+8uQ/IgnhRNMpfoA9bAFWoLG4XrWm6O5rKXortreVQuD+fc1hbzWklOZbw==} engines: {node: '>=18.0.0'} @@ -8829,13 +8229,6 @@ packages: '@sinonjs/commons': 1.8.6 dev: true - /@smithy/abort-controller@2.0.16: - resolution: {integrity: sha512-4foO7738k8kM9flMHu3VLabqu7nPgvIj8TB909S0CnKx0YZz/dcDH3pZ/4JHdatfxlZdKF1JWOYCw9+v3HVVsw==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/abort-controller@3.1.1: resolution: {integrity: sha512-MBJBiidoe+0cTFhyxT8g+9g7CeVccLM0IOKKUMCNQ1CNMJ/eIfoo0RTfVrXOONEI1UCN1W+zkiHSbzUNE9dZtQ==} engines: {node: '>=16.0.0'} @@ -8843,38 +8236,17 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/chunked-blob-reader-native@2.0.1: - resolution: {integrity: sha512-N2oCZRglhWKm7iMBu7S6wDzXirjAofi7tAd26cxmgibRYOBS4D3hGfmkwCpHdASZzwZDD8rluh0Rcqw1JeZDRw==} - dependencies: - '@smithy/util-base64': 2.0.1 - tslib: 2.6.2 - /@smithy/chunked-blob-reader-native@3.0.0: resolution: {integrity: sha512-VDkpCYW+peSuM4zJip5WDfqvg2Mo/e8yxOv3VF1m11y7B8KKMKVFtmZWDe36Fvk8rGuWrPZHHXZ7rR7uM5yWyg==} dependencies: '@smithy/util-base64': 3.0.0 tslib: 2.6.2 - /@smithy/chunked-blob-reader@2.0.0: - resolution: {integrity: sha512-k+J4GHJsMSAIQPChGBrjEmGS+WbPonCXesoqP9fynIqjn7rdOThdH8FAeCmokP9mxTYKQAKoHCLPzNlm6gh7Wg==} - dependencies: - tslib: 2.6.2 - /@smithy/chunked-blob-reader@3.0.0: resolution: {integrity: sha512-sbnURCwjF0gSToGlsBiAmd1lRCmSn72nu9axfJu5lIx6RUEgHu6GwTMbqCdhQSi0Pumcm5vFxsi9XWXb2mTaoA==} dependencies: tslib: 2.6.2 - /@smithy/config-resolver@2.0.23: - resolution: {integrity: sha512-XakUqgtP2YY8Mi+Nlif5BiqJgWdvfxJafSpOSQeCOMizu+PUhE4fBQSy6xFcR+eInrwVadaABNxoJyGUMn15ew==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/node-config-provider': 2.1.9 - '@smithy/types': 2.8.0 - '@smithy/util-config-provider': 2.1.0 - '@smithy/util-middleware': 2.0.9 - tslib: 2.6.2 - /@smithy/config-resolver@3.0.5: resolution: {integrity: sha512-SkW5LxfkSI1bUC74OtfBbdz+grQXYiPYolyu8VfpLIjEoN/sHVBlLeGXMQ1vX4ejkgfv6sxVbQJ32yF2cl1veA==} engines: {node: '>=16.0.0'} @@ -8885,19 +8257,6 @@ packages: '@smithy/util-middleware': 3.0.3 tslib: 2.6.2 - /@smithy/core@1.2.2: - resolution: {integrity: sha512-uLjrskLT+mWb0emTR5QaiAIxVEU7ndpptDaVDrTwwhD+RjvHhjIiGQ3YL5jKk1a5VSDQUA2RGkXvJ6XKRcz6Dg==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/middleware-endpoint': 2.3.0 - '@smithy/middleware-retry': 2.0.26 - '@smithy/middleware-serde': 2.0.16 - '@smithy/protocol-http': 3.0.12 - '@smithy/smithy-client': 2.2.1 - '@smithy/types': 2.8.0 - '@smithy/util-middleware': 2.0.9 - tslib: 2.6.2 - /@smithy/core@2.4.0: resolution: {integrity: sha512-cHXq+FneIF/KJbt4q4pjN186+Jf4ZB0ZOqEaZMBhT79srEyGDDBV31NqBRBjazz8ppQ1bJbDJMY9ba5wKFV36w==} engines: {node: '>=16.0.0'} @@ -8913,16 +8272,6 @@ packages: '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 - /@smithy/credential-provider-imds@2.1.5: - resolution: {integrity: sha512-VfvE6Wg1MUWwpTZFBnUD7zxvPhLY8jlHCzu6bCjlIYoWgXCDzZAML76IlZUEf45nib3rjehnFgg0s1rgsuN/bg==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/node-config-provider': 2.1.9 - '@smithy/property-provider': 2.0.17 - '@smithy/types': 2.8.0 - '@smithy/url-parser': 2.0.16 - tslib: 2.6.2 - /@smithy/credential-provider-imds@3.2.0: resolution: {integrity: sha512-0SCIzgd8LYZ9EJxUjLXBmEKSZR/P/w6l7Rz/pab9culE/RWuqelAKGJvn5qUOl8BgX8Yj5HWM50A5hiB/RzsgA==} engines: {node: '>=16.0.0'} @@ -8933,14 +8282,6 @@ packages: '@smithy/url-parser': 3.0.3 tslib: 2.6.2 - /@smithy/eventstream-codec@2.0.16: - resolution: {integrity: sha512-umYh5pdCE9GHgiMAH49zu9wXWZKNHHdKPm/lK22WYISTjqu29SepmpWNmPiBLy/yUu4HFEGJHIFrDWhbDlApaw==} - dependencies: - '@aws-crypto/crc32': 3.0.0 - '@smithy/types': 2.8.0 - '@smithy/util-hex-encoding': 2.0.0 - tslib: 2.6.2 - /@smithy/eventstream-codec@3.1.2: resolution: {integrity: sha512-0mBcu49JWt4MXhrhRAlxASNy0IjDRFU+aWNDRal9OtUJvJNiwDuyKMUONSOjLjSCeGwZaE0wOErdqULer8r7yw==} dependencies: @@ -8949,14 +8290,6 @@ packages: '@smithy/util-hex-encoding': 3.0.0 tslib: 2.6.2 - /@smithy/eventstream-serde-browser@2.0.16: - resolution: {integrity: sha512-W+BdiN728R57KuZOcG0GczpIOEFf8S5RP/OdVH7T3FMCy8HU2bBU0vB5xZZR5c00VRdoeWrohNv3XlHoZuGRoA==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/eventstream-serde-universal': 2.0.16 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/eventstream-serde-browser@3.0.6: resolution: {integrity: sha512-2hM54UWQUOrki4BtsUI1WzmD13/SeaqT/AB3EUJKbcver/WgKNaiJ5y5F5XXuVe6UekffVzuUDrBZVAA3AWRpQ==} engines: {node: '>=16.0.0'} @@ -8965,13 +8298,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/eventstream-serde-config-resolver@2.0.16: - resolution: {integrity: sha512-8qrE4nh+Tg6m1SMFK8vlzoK+8bUFTlIhXidmmQfASMninXW3Iu0T0bI4YcIk4nLznHZdybQ0qGydIanvVZxzVg==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/eventstream-serde-config-resolver@3.0.3: resolution: {integrity: sha512-NVTYjOuYpGfrN/VbRQgn31x73KDLfCXCsFdad8DiIc3IcdxL+dYA9zEQPyOP7Fy2QL8CPy2WE4WCUD+ZsLNfaQ==} engines: {node: '>=16.0.0'} @@ -8979,14 +8305,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/eventstream-serde-node@2.0.16: - resolution: {integrity: sha512-NRNQuOa6mQdFSkqzY0IV37swHWx0SEoKxFtUfdZvfv0AVQPlSw4N7E3kcRSCpnHBr1kCuWWirdDlWcjWuD81MA==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/eventstream-serde-universal': 2.0.16 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/eventstream-serde-node@3.0.5: resolution: {integrity: sha512-+upXvnHNyZP095s11jF5dhGw/Ihzqwl5G+/KtMnoQOpdfC3B5HYCcDVG9EmgkhJMXJlM64PyN5gjJl0uXFQehQ==} engines: {node: '>=16.0.0'} @@ -8995,14 +8313,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/eventstream-serde-universal@2.0.16: - resolution: {integrity: sha512-ZyLnGaYQMLc75j9kKEVMJ3X6bdBE9qWxhZdTXM5RIltuytxJC3FaOhawBxjE+IL1enmWSIohHGZCm/pLwEliQA==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/eventstream-codec': 2.0.16 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/eventstream-serde-universal@3.0.5: resolution: {integrity: sha512-5u/nXbyoh1s4QxrvNre9V6vfyoLWuiVvvd5TlZjGThIikc3G+uNiG9uOTCWweSRjv1asdDIWK7nOmN7le4RYHQ==} engines: {node: '>=16.0.0'} @@ -9011,15 +8321,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/fetch-http-handler@2.3.2: - resolution: {integrity: sha512-O9R/OlnAOTsnysuSDjt0v2q6DcSvCz5cCFC/CFAWWcLyBwJDeFyGTCTszgpQTb19+Fi8uRwZE5/3ziAQBFeDMQ==} - dependencies: - '@smithy/protocol-http': 3.0.12 - '@smithy/querystring-builder': 2.0.16 - '@smithy/types': 2.8.0 - '@smithy/util-base64': 2.0.1 - tslib: 2.6.2 - /@smithy/fetch-http-handler@3.2.4: resolution: {integrity: sha512-kBprh5Gs5h7ug4nBWZi1FZthdqSM+T7zMmsZxx0IBvWUn7dK3diz2SHn7Bs4dQGFDk8plDv375gzenDoNwrXjg==} dependencies: @@ -9029,14 +8330,6 @@ packages: '@smithy/util-base64': 3.0.0 tslib: 2.6.2 - /@smithy/hash-blob-browser@2.0.17: - resolution: {integrity: sha512-/mPpv1sRiRDdjO4zZuO8be6eeabmg5AVgKDfnmmqkpBtRyMGSJb968fjRuHt+FRAsIGywgIKJFmUUAYjhsi1oQ==} - dependencies: - '@smithy/chunked-blob-reader': 2.0.0 - '@smithy/chunked-blob-reader-native': 2.0.1 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/hash-blob-browser@3.1.2: resolution: {integrity: sha512-hAbfqN2UbISltakCC2TP0kx4LqXBttEv2MqSPE98gVuDFMf05lU+TpC41QtqGP3Ff5A3GwZMPfKnEy0VmEUpmg==} dependencies: @@ -9045,15 +8338,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/hash-node@2.0.18: - resolution: {integrity: sha512-gN2JFvAgnZCyDN9rJgcejfpK0uPPJrSortVVVVWsru9whS7eQey6+gj2eM5ln2i6rHNntIXzal1Fm9XOPuoaKA==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/types': 2.8.0 - '@smithy/util-buffer-from': 2.0.0 - '@smithy/util-utf8': 2.0.2 - tslib: 2.6.2 - /@smithy/hash-node@3.0.3: resolution: {integrity: sha512-2ctBXpPMG+B3BtWSGNnKELJ7SH9e4TNefJS0cd2eSkOOROeBnnVBnAy9LtJ8tY4vUEoe55N4CNPxzbWvR39iBw==} engines: {node: '>=16.0.0'} @@ -9063,14 +8347,6 @@ packages: '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 - /@smithy/hash-stream-node@2.0.18: - resolution: {integrity: sha512-OuFk+ITpv8CtxGjQcS8GA04faNycu9UMm6YobvQzjeEoXZ0dLF6sRfuzD+3S8RHPKpTyLuXtKG1+GiJycZ5TcA==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/types': 2.8.0 - '@smithy/util-utf8': 2.0.2 - tslib: 2.6.2 - /@smithy/hash-stream-node@3.1.2: resolution: {integrity: sha512-PBgDMeEdDzi6JxKwbfBtwQG9eT9cVwsf0dZzLXoJF4sHKHs5HEo/3lJWpn6jibfJwT34I1EBXpBnZE8AxAft6g==} engines: {node: '>=16.0.0'} @@ -9079,12 +8355,6 @@ packages: '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 - /@smithy/invalid-dependency@2.0.16: - resolution: {integrity: sha512-apEHakT/kmpNo1VFHP4W/cjfeP9U0x5qvfsLJubgp7UM/gq4qYp0GbqdE7QhsjUaYvEnrftRqs7+YrtWreV0wA==} - dependencies: - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/invalid-dependency@3.0.3: resolution: {integrity: sha512-ID1eL/zpDULmHJbflb864k72/SNOZCADRc9i7Exq3RUNJw6raWUSlFEQ+3PX3EYs++bTxZB2dE9mEHTQLv61tw==} dependencies: @@ -9103,13 +8373,6 @@ packages: dependencies: tslib: 2.6.2 - /@smithy/md5-js@2.0.18: - resolution: {integrity: sha512-bHwZ8/m6RbERQdVW5rJ2LzeW8qxfXv6Q/S7Fiudhso4pWRrksqLx3nsGZw7bmqqfN4zLqkxydxSa9+4c7s5zxg==} - dependencies: - '@smithy/types': 2.8.0 - '@smithy/util-utf8': 2.0.2 - tslib: 2.6.2 - /@smithy/md5-js@3.0.3: resolution: {integrity: sha512-O/SAkGVwpWmelpj/8yDtsaVe6sINHLB1q8YE/+ZQbDxIw3SRLbTZuRaI10K12sVoENdnHqzPp5i3/H+BcZ3m3Q==} dependencies: @@ -9117,14 +8380,6 @@ packages: '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 - /@smithy/middleware-content-length@2.0.18: - resolution: {integrity: sha512-ZJ9uKPTfxYheTKSKYB+GCvcj+izw9WGzRLhjn8n254q0jWLojUzn7Vw0l4R/Gq7Wdpf/qmk/ptD+6CCXHNVCaw==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/protocol-http': 3.0.12 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/middleware-content-length@3.0.5: resolution: {integrity: sha512-ILEzC2eyxx6ncej3zZSwMpB5RJ0zuqH7eMptxC4KN3f+v9bqT8ohssKbhNR78k/2tWW+KS5Spw+tbPF4Ejyqvw==} engines: {node: '>=16.0.0'} @@ -9133,18 +8388,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/middleware-endpoint@2.3.0: - resolution: {integrity: sha512-VsOAG2YQ8ykjSmKO+CIXdJBIWFo6AAvG6Iw95BakBTqk66/4BI7XyqLevoNSq/lZ6NgZv24sLmrcIN+fLDWBCg==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/middleware-serde': 2.0.16 - '@smithy/node-config-provider': 2.1.9 - '@smithy/shared-ini-file-loader': 2.2.8 - '@smithy/types': 2.8.0 - '@smithy/url-parser': 2.0.16 - '@smithy/util-middleware': 2.0.9 - tslib: 2.6.2 - /@smithy/middleware-endpoint@3.1.0: resolution: {integrity: sha512-5y5aiKCEwg9TDPB4yFE7H6tYvGFf1OJHNczeY10/EFF8Ir8jZbNntQJxMWNfeQjC1mxPsaQ6mR9cvQbf+0YeMw==} engines: {node: '>=16.0.0'} @@ -9157,20 +8400,6 @@ packages: '@smithy/util-middleware': 3.0.3 tslib: 2.6.2 - /@smithy/middleware-retry@2.0.26: - resolution: {integrity: sha512-Qzpxo0U5jfNiq9iD38U3e2bheXwvTEX4eue9xruIvEgh+UKq6dKuGqcB66oBDV7TD/mfoJi9Q/VmaiqwWbEp7A==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/node-config-provider': 2.1.9 - '@smithy/protocol-http': 3.0.12 - '@smithy/service-error-classification': 2.0.9 - '@smithy/smithy-client': 2.2.1 - '@smithy/types': 2.8.0 - '@smithy/util-middleware': 2.0.9 - '@smithy/util-retry': 2.0.9 - tslib: 2.6.2 - uuid: 8.3.2 - /@smithy/middleware-retry@3.0.15: resolution: {integrity: sha512-iTMedvNt1ApdvkaoE8aSDuwaoc+BhvHqttbA/FO4Ty+y/S5hW6Ci/CTScG7vam4RYJWZxdTElc3MEfHRVH6cgQ==} engines: {node: '>=16.0.0'} @@ -9185,13 +8414,6 @@ packages: tslib: 2.6.2 uuid: 9.0.1 - /@smithy/middleware-serde@2.0.16: - resolution: {integrity: sha512-5EAd4t30pcc4M8TSSGq7q/x5IKrxfXR5+SrU4bgxNy7RPHQo2PSWBUco9C+D9Tfqp/JZvprRpK42dnupZafk2g==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/middleware-serde@3.0.3: resolution: {integrity: sha512-puUbyJQBcg9eSErFXjKNiGILJGtiqmuuNKEYNYfUD57fUl4i9+mfmThtQhvFXU0hCVG0iEJhvQUipUf+/SsFdA==} engines: {node: '>=16.0.0'} @@ -9199,13 +8421,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/middleware-stack@2.0.10: - resolution: {integrity: sha512-I2rbxctNq9FAPPEcuA1ntZxkTKOPQFy7YBPOaD/MLg1zCvzv21CoNxR0py6J8ZVC35l4qE4nhxB0f7TF5/+Ldw==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/middleware-stack@3.0.3: resolution: {integrity: sha512-r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA==} engines: {node: '>=16.0.0'} @@ -9213,15 +8428,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/node-config-provider@2.1.9: - resolution: {integrity: sha512-tUyW/9xrRy+s7RXkmQhgYkAPMpTIF8izK4orhHjNFEKR3QZiOCbWB546Y8iB/Fpbm3O9+q0Af9rpywLKJOwtaQ==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/property-provider': 2.0.17 - '@smithy/shared-ini-file-loader': 2.2.8 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/node-config-provider@3.1.4: resolution: {integrity: sha512-YvnElQy8HR4vDcAjoy7Xkx9YT8xZP4cBXcbJSgm/kxmiQu08DwUwj8rkGnyoJTpfl/3xYHH+d8zE+eHqoDCSdQ==} engines: {node: '>=16.0.0'} @@ -9231,16 +8437,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/node-http-handler@2.2.2: - resolution: {integrity: sha512-XO58TO/Eul/IBQKFKaaBtXJi0ItEQQCT+NI4IiKHCY/4KtqaUT6y/wC1EvDqlA9cP7Dyjdj7FdPs4DyynH3u7g==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/abort-controller': 2.0.16 - '@smithy/protocol-http': 3.0.12 - '@smithy/querystring-builder': 2.0.16 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/node-http-handler@3.1.4: resolution: {integrity: sha512-+UmxgixgOr/yLsUxcEKGH0fMNVteJFGkmRltYFHnBMlogyFdpzn2CwqWmxOrfJELhV34v0WSlaqG1UtE1uXlJg==} engines: {node: '>=16.0.0'} @@ -9251,13 +8447,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/property-provider@2.0.17: - resolution: {integrity: sha512-+VkeZbVu7qtQ2DjI48Qwaf9fPOr3gZIwxQpuLJgRRSkWsdSvmaTCxI3gzRFKePB63Ts9r4yjn4HkxSCSkdWmcQ==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/property-provider@3.1.3: resolution: {integrity: sha512-zahyOVR9Q4PEoguJ/NrFP4O7SMAfYO1HLhB18M+q+Z4KFd4V2obiMnlVoUFzFLSPeVt1POyNWneHHrZaTMoc/g==} engines: {node: '>=16.0.0'} @@ -9265,13 +8454,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/protocol-http@3.0.12: - resolution: {integrity: sha512-Xz4iaqLiaBfbQpB9Hgi3VcZYbP7xRDXYhd8XWChh4v94uw7qwmvlxdU5yxzfm6ACJM66phHrTbS5TVvj5uQ72w==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/protocol-http@4.1.0: resolution: {integrity: sha512-dPVoHYQ2wcHooGXg3LQisa1hH0e4y0pAddPMeeUPipI1tEOqL6A4N0/G7abeq+K8wrwSgjk4C0wnD1XZpJm5aA==} engines: {node: '>=16.0.0'} @@ -9279,14 +8461,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/querystring-builder@2.0.16: - resolution: {integrity: sha512-Q/GsJT0C0mijXMRs7YhZLLCP5FcuC4797lYjKQkME5CZohnLC4bEhylAd2QcD3gbMKNjCw8+T2I27WKiV/wToA==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/types': 2.8.0 - '@smithy/util-uri-escape': 2.0.0 - tslib: 2.6.2 - /@smithy/querystring-builder@3.0.3: resolution: {integrity: sha512-vyWckeUeesFKzCDaRwWLUA1Xym9McaA6XpFfAK5qI9DKJ4M33ooQGqvM4J+LalH4u/Dq9nFiC8U6Qn1qi0+9zw==} engines: {node: '>=16.0.0'} @@ -9295,13 +8469,6 @@ packages: '@smithy/util-uri-escape': 3.0.0 tslib: 2.6.2 - /@smithy/querystring-parser@2.0.16: - resolution: {integrity: sha512-c4ueAuL6BDYKWpkubjrQthZKoC3L5kql5O++ovekNxiexRXTlLIVlCR4q3KziOktLIw66EU9SQljPXd/oN6Okg==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/querystring-parser@3.0.3: resolution: {integrity: sha512-zahM1lQv2YjmznnfQsWbYojFe55l0SLG/988brlLv1i8z3dubloLF+75ATRsqPBboUXsW6I9CPGE5rQgLfY0vQ==} engines: {node: '>=16.0.0'} @@ -9309,25 +8476,12 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/service-error-classification@2.0.9: - resolution: {integrity: sha512-0K+8GvtwI7VkGmmInPydM2XZyBfIqLIbfR7mDQ+oPiz8mIinuHbV6sxOLdvX1Jv/myk7XTK9orgt3tuEpBu/zg==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/types': 2.8.0 - /@smithy/service-error-classification@3.0.3: resolution: {integrity: sha512-Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ==} engines: {node: '>=16.0.0'} dependencies: '@smithy/types': 3.3.0 - /@smithy/shared-ini-file-loader@2.2.8: - resolution: {integrity: sha512-E62byatbwSWrtq9RJ7xN40tqrRKDGrEL4EluyNpaIDvfvet06a/QC58oHw2FgVaEgkj0tXZPjZaKrhPfpoU0qw==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/shared-ini-file-loader@3.1.4: resolution: {integrity: sha512-qMxS4hBGB8FY2GQqshcRUy1K6k8aBWP5vwm8qKkCT3A9K2dawUwOIJfqh9Yste/Bl0J2lzosVyrXDj68kLcHXQ==} engines: {node: '>=16.0.0'} @@ -9335,19 +8489,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/signature-v4@2.0.19: - resolution: {integrity: sha512-nwc3JihdM+kcJjtORv/n7qRHN2Kfh7S2RJI2qr8pz9UcY5TD8rSCRGQ0g81HgyS3jZ5X9U/L4p014P3FonBPhg==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/eventstream-codec': 2.0.16 - '@smithy/is-array-buffer': 2.0.0 - '@smithy/types': 2.8.0 - '@smithy/util-hex-encoding': 2.0.0 - '@smithy/util-middleware': 2.0.9 - '@smithy/util-uri-escape': 2.0.0 - '@smithy/util-utf8': 2.0.2 - tslib: 2.6.2 - /@smithy/signature-v4@4.1.0: resolution: {integrity: sha512-aRryp2XNZeRcOtuJoxjydO6QTaVhxx/vjaR+gx7ZjaFgrgPRyZ3HCTbfwqYj6ZWEBHkCSUfcaymKPURaByukag==} engines: {node: '>=16.0.0'} @@ -9361,17 +8502,6 @@ packages: '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 - /@smithy/smithy-client@2.2.1: - resolution: {integrity: sha512-SpD7FLK92XV2fon2hMotaNDa2w5VAy5/uVjP9WFmjGSgWM8pTPVkHcDl1yFs5Z8LYbij0FSz+DbCBK6i+uXXUA==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/middleware-endpoint': 2.3.0 - '@smithy/middleware-stack': 2.0.10 - '@smithy/protocol-http': 3.0.12 - '@smithy/types': 2.8.0 - '@smithy/util-stream': 2.0.24 - tslib: 2.6.2 - /@smithy/smithy-client@3.2.0: resolution: {integrity: sha512-pDbtxs8WOhJLJSeaF/eAbPgXg4VVYFlRcL/zoNYA5WbG3wBL06CHtBSg53ppkttDpAJ/hdiede+xApip1CwSLw==} engines: {node: '>=16.0.0'} @@ -9383,25 +8513,12 @@ packages: '@smithy/util-stream': 3.1.3 tslib: 2.6.2 - /@smithy/types@2.8.0: - resolution: {integrity: sha512-h9sz24cFgt/W1Re22OlhQKmUZkNh244ApgRsUDYinqF8R+QgcsBIX344u2j61TPshsTz3CvL6HYU1DnQdsSrHA==} - engines: {node: '>=14.0.0'} - dependencies: - tslib: 2.6.2 - /@smithy/types@3.3.0: resolution: {integrity: sha512-IxvBBCTFDHbVoK7zIxqA1ZOdc4QfM5HM7rGleCuHi7L1wnKv5Pn69xXJQ9hgxH60ZVygH9/JG0jRgtUncE3QUA==} engines: {node: '>=16.0.0'} dependencies: tslib: 2.6.2 - /@smithy/url-parser@2.0.16: - resolution: {integrity: sha512-Wfz5WqAoRT91TjRy1JeLR0fXtkIXHGsMbgzKFTx7E68SrZ55TB8xoG+vm11Ru4gheFTMXjAjwAxv1jQdC+pAQA==} - dependencies: - '@smithy/querystring-parser': 2.0.16 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/url-parser@3.0.3: resolution: {integrity: sha512-pw3VtZtX2rg+s6HMs6/+u9+hu6oY6U7IohGhVNnjbgKy86wcIsSZwgHrFR+t67Uyxvp4Xz3p3kGXXIpTNisq8A==} dependencies: @@ -9409,13 +8526,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/util-base64@2.0.1: - resolution: {integrity: sha512-DlI6XFYDMsIVN+GH9JtcRp3j02JEVuWIn/QOZisVzpIAprdsxGveFed0bjbMRCqmIFe8uetn5rxzNrBtIGrPIQ==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/util-buffer-from': 2.0.0 - tslib: 2.6.2 - /@smithy/util-base64@3.0.0: resolution: {integrity: sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==} engines: {node: '>=16.0.0'} @@ -9424,22 +8534,11 @@ packages: '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 - /@smithy/util-body-length-browser@2.0.1: - resolution: {integrity: sha512-NXYp3ttgUlwkaug4bjBzJ5+yIbUbUx8VsSLuHZROQpoik+gRkIBeEG9MPVYfvPNpuXb/puqodeeUXcKFe7BLOQ==} - dependencies: - tslib: 2.6.2 - /@smithy/util-body-length-browser@3.0.0: resolution: {integrity: sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==} dependencies: tslib: 2.6.2 - /@smithy/util-body-length-node@2.1.0: - resolution: {integrity: sha512-/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw==} - engines: {node: '>=14.0.0'} - dependencies: - tslib: 2.6.2 - /@smithy/util-body-length-node@3.0.0: resolution: {integrity: sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==} engines: {node: '>=16.0.0'} @@ -9460,28 +8559,12 @@ packages: '@smithy/is-array-buffer': 3.0.0 tslib: 2.6.2 - /@smithy/util-config-provider@2.1.0: - resolution: {integrity: sha512-S6V0JvvhQgFSGLcJeT1CBsaTR03MM8qTuxMH9WPCCddlSo2W0V5jIHimHtIQALMLEDPGQ0ROSRr/dU0O+mxiQg==} - engines: {node: '>=14.0.0'} - dependencies: - tslib: 2.6.2 - /@smithy/util-config-provider@3.0.0: resolution: {integrity: sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==} engines: {node: '>=16.0.0'} dependencies: tslib: 2.6.2 - /@smithy/util-defaults-mode-browser@2.0.24: - resolution: {integrity: sha512-TsP5mBuLgO2C21+laNG2nHYZEyUdkbGURv2tHvSuQQxLz952MegX95uwdxOY2jR2H4GoKuVRfdJq7w4eIjGYeg==} - engines: {node: '>= 10.0.0'} - dependencies: - '@smithy/property-provider': 2.0.17 - '@smithy/smithy-client': 2.2.1 - '@smithy/types': 2.8.0 - bowser: 2.11.0 - tslib: 2.6.2 - /@smithy/util-defaults-mode-browser@3.0.15: resolution: {integrity: sha512-FZ4Psa3vjp8kOXcd3HJOiDPBCWtiilLl57r0cnNtq/Ga9RSDrM5ERL6xt+tO43+2af6Pn5Yp92x2n5vPuduNfg==} engines: {node: '>= 10.0.0'} @@ -9492,18 +8575,6 @@ packages: bowser: 2.11.0 tslib: 2.6.2 - /@smithy/util-defaults-mode-node@2.0.32: - resolution: {integrity: sha512-d0S33dXA2cq1NyorVMroMrEtqKMr3MlyLITcfTBf9pXiigYiPMOtbSI7czHIfDbuVuM89Cg0urAgpt73QV9mPQ==} - engines: {node: '>= 10.0.0'} - dependencies: - '@smithy/config-resolver': 2.0.23 - '@smithy/credential-provider-imds': 2.1.5 - '@smithy/node-config-provider': 2.1.9 - '@smithy/property-provider': 2.0.17 - '@smithy/smithy-client': 2.2.1 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/util-defaults-mode-node@3.0.15: resolution: {integrity: sha512-KSyAAx2q6d0t6f/S4XB2+3+6aQacm3aLMhs9aLMqn18uYGUepbdssfogW5JQZpc6lXNBnp0tEnR5e9CEKmEd7A==} engines: {node: '>= 10.0.0'} @@ -9516,14 +8587,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/util-endpoints@1.0.8: - resolution: {integrity: sha512-l8zVuyZZ61IzZBYp5NWvsAhbaAjYkt0xg9R4xUASkg5SEeTT2meHOJwJHctKMFUXe4QZbn9fR2MaBYjP2119+w==} - engines: {node: '>= 14.0.0'} - dependencies: - '@smithy/node-config-provider': 2.1.9 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/util-endpoints@2.0.5: resolution: {integrity: sha512-ReQP0BWihIE68OAblC/WQmDD40Gx+QY1Ez8mTdFMXpmjfxSyz2fVQu3A4zXRfQU9sZXtewk3GmhfOHswvX+eNg==} engines: {node: '>=16.0.0'} @@ -9532,25 +8595,12 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/util-hex-encoding@2.0.0: - resolution: {integrity: sha512-c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA==} - engines: {node: '>=14.0.0'} - dependencies: - tslib: 2.6.2 - /@smithy/util-hex-encoding@3.0.0: resolution: {integrity: sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==} engines: {node: '>=16.0.0'} dependencies: tslib: 2.6.2 - /@smithy/util-middleware@2.0.9: - resolution: {integrity: sha512-PnCnBJ07noMX1lMDTEefmxSlusWJUiLfrme++MfK5TD0xz8NYmakgoXy5zkF/16zKGmiwOeKAztWT/Vjk1KRIQ==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/util-middleware@3.0.3: resolution: {integrity: sha512-l+StyYYK/eO3DlVPbU+4Bi06Jjal+PFLSMmlWM1BEwyLxZ3aKkf1ROnoIakfaA7mC6uw3ny7JBkau4Yc+5zfWw==} engines: {node: '>=16.0.0'} @@ -9558,14 +8608,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/util-retry@2.0.9: - resolution: {integrity: sha512-46BFWe9RqB6g7f4mxm3W3HlqknqQQmWHKlhoqSFZuGNuiDU5KqmpebMbvC3tjTlUkqn4xa2Z7s3Hwb0HNs5scw==} - engines: {node: '>= 14.0.0'} - dependencies: - '@smithy/service-error-classification': 2.0.9 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/util-retry@3.0.3: resolution: {integrity: sha512-AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w==} engines: {node: '>=16.0.0'} @@ -9574,19 +8616,6 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 - /@smithy/util-stream@2.0.24: - resolution: {integrity: sha512-hRpbcRrOxDriMVmbya+Mv77VZVupxRAsfxVDKS54XuiURhdiwCUXJP0X1iJhHinuUf6n8pBF0MkG9C8VooMnWw==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/fetch-http-handler': 2.3.2 - '@smithy/node-http-handler': 2.2.2 - '@smithy/types': 2.8.0 - '@smithy/util-base64': 2.0.1 - '@smithy/util-buffer-from': 2.0.0 - '@smithy/util-hex-encoding': 2.0.0 - '@smithy/util-utf8': 2.0.2 - tslib: 2.6.2 - /@smithy/util-stream@3.1.3: resolution: {integrity: sha512-FIv/bRhIlAxC0U7xM1BCnF2aDRPq0UaelqBHkM2lsCp26mcBbgI0tCVTv+jGdsQLUmAMybua/bjDsSu8RQHbmw==} engines: {node: '>=16.0.0'} @@ -9600,12 +8629,6 @@ packages: '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 - /@smithy/util-uri-escape@2.0.0: - resolution: {integrity: sha512-ebkxsqinSdEooQduuk9CbKcI+wheijxEb3utGXkCoYQkJnwTnLbH1JXGimJtUkQwNQbsbuYwG2+aFVyZf5TLaw==} - engines: {node: '>=14.0.0'} - dependencies: - tslib: 2.6.2 - /@smithy/util-uri-escape@3.0.0: resolution: {integrity: sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==} engines: {node: '>=16.0.0'} @@ -9626,14 +8649,6 @@ packages: '@smithy/util-buffer-from': 3.0.0 tslib: 2.6.2 - /@smithy/util-waiter@2.0.16: - resolution: {integrity: sha512-5i4YONHQ6HoUWDd+X0frpxTXxSXgJhUFl+z0iMy/zpUmVeCQY2or3Vss6DzHKKMMQL4pmVHpQm9WayHDorFdZg==} - engines: {node: '>=14.0.0'} - dependencies: - '@smithy/abort-controller': 2.0.16 - '@smithy/types': 2.8.0 - tslib: 2.6.2 - /@smithy/util-waiter@3.1.2: resolution: {integrity: sha512-4pP0EV3iTsexDx+8PPGAKCQpd/6hsQBaQhqWzU4hqKPHN5epPsxKbvUTIiYIHTxaKt6/kEaqPBpu/ufvfbrRzw==} engines: {node: '>=16.0.0'} @@ -10125,6 +9140,7 @@ packages: dependencies: '@types/node': 18.19.8 form-data: 4.0.0 + dev: true /@types/node-forge@1.3.11: resolution: {integrity: sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==} @@ -10306,11 +9322,6 @@ packages: /@types/tough-cookie@4.0.5: resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==} - /@types/tunnel@0.0.3: - resolution: {integrity: sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==} - dependencies: - '@types/node': 18.19.8 - /@types/uuid@8.3.4: resolution: {integrity: sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==} dev: true @@ -14138,12 +13149,6 @@ packages: punycode: 1.4.1 dev: true - /fast-xml-parser@4.2.5: - resolution: {integrity: sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==} - hasBin: true - dependencies: - strnum: 1.0.5 - /fast-xml-parser@4.3.3: resolution: {integrity: sha512-coV/D1MhrShMvU6D0I+VAK3umz6hUaxxhL0yp/9RjfiYUfAv14rDhGQL+PLForhMdr0wq3PiV07WtkkNjJjNHg==} hasBin: true @@ -19198,9 +18203,6 @@ packages: /pg-connection-string@2.6.2: resolution: {integrity: sha512-ch6OwaeaPYcova4kKZ15sbJ2hKb/VP48ZD2gE7i1J+L4MspCtBMAx8nMgz7bksc7IojCIIWuEhHibSMFH8m8oA==} - /pg-error-constants@1.0.0: - resolution: {integrity: sha512-uXKMjv2Kz1S9y2pu540l5uTkrZwCLrmnMSNHdvMDlXSr29pZM88pkKosFN0bDErFsITVjhQYeA08YxSepSIjHA==} - /pg-int8@1.0.1: resolution: {integrity: sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==} engines: {node: '>=4.0.0'} @@ -19474,10 +18476,6 @@ packages: /process-nextick-args@2.0.1: resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} - /process@0.11.10: - resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==} - engines: {node: '>= 0.6.0'} - /promise-coalesce@1.1.2: resolution: {integrity: sha512-zLaJ9b8hnC564fnJH6NFSOGZYYdzrAJn2JUUIwzoQb32fG2QAakpDNM+CZo1km6keXkRXRM+hml1BFAPVnPkxg==} engines: {node: '>=16'} @@ -21686,6 +20684,7 @@ packages: /tslib@1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} + dev: true /tslib@2.0.3: resolution: {integrity: sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==} @@ -21741,10 +20740,6 @@ packages: dependencies: safe-buffer: 5.2.1 - /tunnel@0.0.6: - resolution: {integrity: sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==} - engines: {node: '>=0.6.11 <=0.7.0 || >=0.7.3'} - /tweetnacl@0.14.5: resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==} @@ -22726,21 +21721,10 @@ packages: resolution: {integrity: sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==} dev: true - /xml2js@0.5.0: - resolution: {integrity: sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==} - engines: {node: '>=4.0.0'} - dependencies: - sax: 1.3.0 - xmlbuilder: 11.0.1 - /xml@1.0.1: resolution: {integrity: sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==} dev: true - /xmlbuilder@11.0.1: - resolution: {integrity: sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==} - engines: {node: '>=4.0'} - /xmlchars@2.2.0: resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==} From 5aca619dbad98c54e7ba8afa63bf4406def4f807 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Sun, 1 Sep 2024 09:17:18 +0200 Subject: [PATCH 03/45] API: Update mikro orm --- .changeset/fast-weeks-remember.md | 10 +++ demo/api/package.json | 10 +-- packages/api/package.json | 20 +++--- pnpm-lock.yaml | 116 ++++++++++++++++-------------- 4 files changed, 86 insertions(+), 70 deletions(-) create mode 100644 .changeset/fast-weeks-remember.md diff --git a/.changeset/fast-weeks-remember.md b/.changeset/fast-weeks-remember.md new file mode 100644 index 00000000..078deb69 --- /dev/null +++ b/.changeset/fast-weeks-remember.md @@ -0,0 +1,10 @@ +--- +"@comet/brevo-api": major +--- + +Make this package compatible with [COMET v7](https://docs.comet-dxp.com/docs/migration/migration-from-v6-to-v7) + +**Breaking Changes**: + +- Now requires >= v7.2.1 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/api/package.json b/demo/api/package.json index 7ea74818..a015536c 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -55,11 +55,11 @@ "@faker-js/faker": "^8.3.1", "@hapi/accept": "^5.0.0", "@kubernetes/client-node": "^0.18.0", - "@mikro-orm/cli": "^5.0.5", - "@mikro-orm/core": "^5.0.5", - "@mikro-orm/migrations": "^5.0.0", - "@mikro-orm/nestjs": "^5.0.0", - "@mikro-orm/postgresql": "^5.0.5", + "@mikro-orm/cli": "^5.9.8", + "@mikro-orm/core": "^5.9.8", + "@mikro-orm/migrations": "^5.9.8", + "@mikro-orm/nestjs": "^5.2.3", + "@mikro-orm/postgresql": "^5.9.8", "@nestjs/apollo": "^10.0.0", "@nestjs/common": "^9.0.0", "@nestjs/config": "^2.0.0", diff --git a/packages/api/package.json b/packages/api/package.json index f211fcc0..37326cfa 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -40,11 +40,11 @@ "@comet/cms-api": "^7.2.1", "@comet/eslint-config": "^7.2.1", "@kubernetes/client-node": "^0.18.0", - "@mikro-orm/cli": "^5.7.1", - "@mikro-orm/core": "^5.0.5", - "@mikro-orm/migrations": "^5.7.1", - "@mikro-orm/nestjs": "^5.0.0", - "@mikro-orm/postgresql": "^5.0.4", + "@mikro-orm/cli": "^5.9.8", + "@mikro-orm/core": "^5.9.8", + "@mikro-orm/migrations": "^5.9.8", + "@mikro-orm/nestjs": "^5.2.3", + "@mikro-orm/postgresql": "^5.9.8", "@nestjs/common": "^9.0.0", "@nestjs/core": "^9.0.0", "@nestjs/graphql": "^10.0.0", @@ -76,11 +76,11 @@ "peerDependencies": { "@comet/blocks-api": "^7.2.1", "@comet/cms-api": "^7.2.1", - "@mikro-orm/cli": "^5.7.1", - "@mikro-orm/core": "^5.0.5", - "@mikro-orm/migrations": "^5.7.1", - "@mikro-orm/nestjs": "^5.0.0", - "@mikro-orm/postgresql": "^5.0.4", + "@mikro-orm/cli": "^5.9.8", + "@mikro-orm/core": "^5.9.8", + "@mikro-orm/migrations": "^5.9.8", + "@mikro-orm/nestjs": "^5.2.3", + "@mikro-orm/postgresql": "^5.9.8", "@nestjs/common": "^9.0.0", "@nestjs/platform-express": "^9.0.0", "axios": "^0.21.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c853c4b6..dd6aeaff 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -287,7 +287,7 @@ importers: version: link:../../packages/api '@comet/cms-api': specifier: ^7.2.1 - version: 7.2.1(@kubernetes/client-node@0.18.1)(@mikro-orm/core@5.9.7)(@mikro-orm/migrations@5.9.7)(@mikro-orm/nestjs@5.2.3)(@mikro-orm/postgresql@5.9.7)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/graphql@10.2.1)(@nestjs/platform-express@9.4.3)(express@4.18.2)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) + version: 7.2.1(@kubernetes/client-node@0.18.1)(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8)(@mikro-orm/nestjs@5.2.3)(@mikro-orm/postgresql@5.9.8)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/graphql@10.2.1)(@nestjs/platform-express@9.4.3)(express@4.18.2)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) '@faker-js/faker': specifier: ^8.3.1 version: 8.3.1 @@ -298,20 +298,20 @@ importers: specifier: ^0.18.0 version: 0.18.1 '@mikro-orm/cli': - specifier: ^5.0.5 - version: 5.9.7(@mikro-orm/migrations@5.9.7)(@mikro-orm/postgresql@5.9.7) + specifier: ^5.9.8 + version: 5.9.8(@mikro-orm/migrations@5.9.8)(@mikro-orm/postgresql@5.9.8) '@mikro-orm/core': - specifier: ^5.0.5 - version: 5.9.7(@mikro-orm/migrations@5.9.7)(@mikro-orm/postgresql@5.9.7) + specifier: ^5.9.8 + version: 5.9.8(@mikro-orm/migrations@5.9.8)(@mikro-orm/postgresql@5.9.8) '@mikro-orm/migrations': - specifier: ^5.0.0 - version: 5.9.7(@mikro-orm/core@5.9.7) + specifier: ^5.9.8 + version: 5.9.8(@mikro-orm/core@5.9.8) '@mikro-orm/nestjs': - specifier: ^5.0.0 - version: 5.2.3(@mikro-orm/core@5.9.7)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) + specifier: ^5.2.3 + version: 5.2.3(@mikro-orm/core@5.9.8)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) '@mikro-orm/postgresql': - specifier: ^5.0.5 - version: 5.9.7(@mikro-orm/core@5.9.7)(@mikro-orm/migrations@5.9.7) + specifier: ^5.9.8 + version: 5.9.8(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8) '@nestjs/apollo': specifier: ^10.0.0 version: 10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/graphql@10.2.1)(apollo-server-core@3.13.0)(apollo-server-express@3.13.0)(graphql@15.8.0) @@ -958,7 +958,7 @@ importers: version: 7.2.1(@nestjs/common@9.4.3) '@comet/cms-api': specifier: ^7.2.1 - version: 7.2.1(@kubernetes/client-node@0.18.1)(@mikro-orm/core@5.9.7)(@mikro-orm/migrations@5.9.7)(@mikro-orm/nestjs@5.2.3)(@mikro-orm/postgresql@5.9.7)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/graphql@10.2.1)(@nestjs/platform-express@9.4.3)(express@4.18.2)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) + version: 7.2.1(@kubernetes/client-node@0.18.1)(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8)(@mikro-orm/nestjs@5.2.3)(@mikro-orm/postgresql@5.9.8)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/graphql@10.2.1)(@nestjs/platform-express@9.4.3)(express@4.18.2)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) '@comet/eslint-config': specifier: ^7.2.1 version: 7.2.1(eslint@8.56.0)(prettier@2.8.8)(ts-jest@29.1.1)(typescript@4.9.5) @@ -966,20 +966,20 @@ importers: specifier: ^0.18.0 version: 0.18.1 '@mikro-orm/cli': - specifier: ^5.7.1 - version: 5.9.7(@mikro-orm/migrations@5.9.7)(@mikro-orm/postgresql@5.9.7) + specifier: ^5.9.8 + version: 5.9.8(@mikro-orm/migrations@5.9.8)(@mikro-orm/postgresql@5.9.8) '@mikro-orm/core': - specifier: ^5.0.5 - version: 5.9.7(@mikro-orm/migrations@5.9.7)(@mikro-orm/postgresql@5.9.7) + specifier: ^5.9.8 + version: 5.9.8(@mikro-orm/migrations@5.9.8)(@mikro-orm/postgresql@5.9.8) '@mikro-orm/migrations': - specifier: ^5.7.1 - version: 5.9.7(@mikro-orm/core@5.9.7) + specifier: ^5.9.8 + version: 5.9.8(@mikro-orm/core@5.9.8) '@mikro-orm/nestjs': - specifier: ^5.0.0 - version: 5.2.3(@mikro-orm/core@5.9.7)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) + specifier: ^5.2.3 + version: 5.2.3(@mikro-orm/core@5.9.8)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) '@mikro-orm/postgresql': - specifier: ^5.0.4 - version: 5.9.7(@mikro-orm/core@5.9.7)(@mikro-orm/migrations@5.9.7) + specifier: ^5.9.8 + version: 5.9.8(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8) '@nestjs/common': specifier: ^9.0.0 version: 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.13.2)(reflect-metadata@0.1.14)(rxjs@7.8.1) @@ -4080,7 +4080,7 @@ packages: - draft-js - history - /@comet/cms-api@7.2.1(@kubernetes/client-node@0.18.1)(@mikro-orm/core@5.9.7)(@mikro-orm/migrations@5.9.7)(@mikro-orm/nestjs@5.2.3)(@mikro-orm/postgresql@5.9.7)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/graphql@10.2.1)(@nestjs/platform-express@9.4.3)(express@4.18.2)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1): + /@comet/cms-api@7.2.1(@kubernetes/client-node@0.18.1)(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8)(@mikro-orm/nestjs@5.2.3)(@mikro-orm/postgresql@5.9.8)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/graphql@10.2.1)(@nestjs/platform-express@9.4.3)(express@4.18.2)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1): resolution: {integrity: sha512-atzg54MInYiMPOYWndFKWsnSZdP2aHCNI0kDqW8viuAaF/g9DNX6ecKFiZRzLG73iY5JZElKgpEKgbx7yf81lg==} hasBin: true peerDependencies: @@ -4111,10 +4111,10 @@ packages: '@golevelup/nestjs-discovery': 3.0.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) '@hapi/accept': 5.0.2 '@kubernetes/client-node': 0.18.1 - '@mikro-orm/core': 5.9.7(@mikro-orm/migrations@5.9.7)(@mikro-orm/postgresql@5.9.7) - '@mikro-orm/migrations': 5.9.7(@mikro-orm/core@5.9.7) - '@mikro-orm/nestjs': 5.2.3(@mikro-orm/core@5.9.7)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) - '@mikro-orm/postgresql': 5.9.7(@mikro-orm/core@5.9.7)(@mikro-orm/migrations@5.9.7) + '@mikro-orm/core': 5.9.8(@mikro-orm/migrations@5.9.8)(@mikro-orm/postgresql@5.9.8) + '@mikro-orm/migrations': 5.9.8(@mikro-orm/core@5.9.8) + '@mikro-orm/nestjs': 5.2.3(@mikro-orm/core@5.9.8)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) + '@mikro-orm/postgresql': 5.9.8(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8) '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.13.2)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/core': 9.4.3(@nestjs/common@9.4.3)(@nestjs/platform-express@9.4.3)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/graphql': 10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.13.2)(graphql@15.8.0)(reflect-metadata@0.1.14) @@ -6177,8 +6177,8 @@ packages: read-yaml-file: 1.1.0 dev: true - /@mikro-orm/cli@5.9.7(@mikro-orm/migrations@5.9.7)(@mikro-orm/postgresql@5.9.7): - resolution: {integrity: sha512-RHMep4lOFRqniz3m97/JXl5DNFhZbGMpTtjw6C1ITYI9ZwWsSZbfBUTGy+PQTZKl9OinFoyR6E/Os/gj8y+NUg==} + /@mikro-orm/cli@5.9.8(@mikro-orm/migrations@5.9.8)(@mikro-orm/postgresql@5.9.8): + resolution: {integrity: sha512-v3KHddyrovHiPz31mfa44GjnOYH2CuEZLiyWo8G/Wy0WP87EuDv5eEGuHJ9GAfd9jvOD4Cy8l56tu/bg/0YGGA==} engines: {node: '>= 14.0.0'} hasBin: true peerDependencies: @@ -6215,10 +6215,10 @@ packages: optional: true dependencies: '@jercle/yargonaut': 1.1.5 - '@mikro-orm/core': 5.9.7(@mikro-orm/migrations@5.9.7)(@mikro-orm/postgresql@5.9.7) - '@mikro-orm/knex': 5.9.7(@mikro-orm/core@5.9.7)(@mikro-orm/migrations@5.9.7)(pg@8.11.3) - '@mikro-orm/migrations': 5.9.7(@mikro-orm/core@5.9.7) - '@mikro-orm/postgresql': 5.9.7(@mikro-orm/core@5.9.7)(@mikro-orm/migrations@5.9.7) + '@mikro-orm/core': 5.9.8(@mikro-orm/migrations@5.9.8)(@mikro-orm/postgresql@5.9.8) + '@mikro-orm/knex': 5.9.8(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8)(pg@8.11.3) + '@mikro-orm/migrations': 5.9.8(@mikro-orm/core@5.9.8) + '@mikro-orm/postgresql': 5.9.8(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8) fs-extra: 11.1.1 tsconfig-paths: 4.2.0 yargs: 17.7.2 @@ -6233,8 +6233,8 @@ packages: - supports-color - tedious - /@mikro-orm/core@5.9.7(@mikro-orm/migrations@5.9.7)(@mikro-orm/postgresql@5.9.7): - resolution: {integrity: sha512-VzbpJPQlwuK6Q/4FkppWNGKvzyYL31Gsw/qskr/GCa/010yLO8u3RQio/Q1EKRi+tNsjhqTPGA1b7OOM+DvpiQ==} + /@mikro-orm/core@5.9.8(@mikro-orm/migrations@5.9.8)(@mikro-orm/postgresql@5.9.8): + resolution: {integrity: sha512-bfTYInwc+EtPgLOxa5iBG5vKT1qq5swDcsc2F7Iu6sesBLKNputURA7qPmY6TCWQtSL/hvB3QjsCzY48LllD+w==} engines: {node: '>= 14.0.0'} peerDependencies: '@mikro-orm/better-sqlite': ^5.0.0 @@ -6269,18 +6269,18 @@ packages: '@mikro-orm/sqlite': optional: true dependencies: - '@mikro-orm/migrations': 5.9.7(@mikro-orm/core@5.9.7) - '@mikro-orm/postgresql': 5.9.7(@mikro-orm/core@5.9.7)(@mikro-orm/migrations@5.9.7) + '@mikro-orm/migrations': 5.9.8(@mikro-orm/core@5.9.8) + '@mikro-orm/postgresql': 5.9.8(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8) acorn-loose: 8.3.0 acorn-walk: 8.2.0 dotenv: 16.3.1 fs-extra: 11.1.1 globby: 11.1.0 - mikro-orm: 5.9.7 + mikro-orm: 5.9.8 reflect-metadata: 0.1.13 - /@mikro-orm/knex@5.9.7(@mikro-orm/core@5.9.7)(@mikro-orm/migrations@5.9.7)(pg@8.11.3): - resolution: {integrity: sha512-LmyoXPXrEtTJ4/D/2/ppWMjRxIHwyk/E/2SNz28/fmN+nK9of6Sqa0ql6M0WJRNxYOxLiVOGZWy1fGJAGW3lCg==} + /@mikro-orm/knex@5.9.8(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8)(pg@8.11.3): + resolution: {integrity: sha512-Kitz11QY7Id37huNUfsxSkgnET8X/fuL861yUK9rJ8xrRiEakdm1r/lM1pLYcB/oikAphYLTgW+M/t3LoJb8aw==} engines: {node: '>= 14.0.0'} peerDependencies: '@mikro-orm/core': ^5.0.0 @@ -6310,8 +6310,8 @@ packages: sqlite3: optional: true dependencies: - '@mikro-orm/core': 5.9.7(@mikro-orm/migrations@5.9.7)(@mikro-orm/postgresql@5.9.7) - '@mikro-orm/migrations': 5.9.7(@mikro-orm/core@5.9.7) + '@mikro-orm/core': 5.9.8(@mikro-orm/migrations@5.9.8)(@mikro-orm/postgresql@5.9.8) + '@mikro-orm/migrations': 5.9.8(@mikro-orm/core@5.9.8) fs-extra: 11.1.1 knex: 2.5.1(pg@8.11.3) pg: 8.11.3 @@ -6321,14 +6321,14 @@ packages: - supports-color - tedious - /@mikro-orm/migrations@5.9.7(@mikro-orm/core@5.9.7): - resolution: {integrity: sha512-5CFVIwmGMxN7p7Rs3KRQmYlDVy47DN2MJQqtDOSVG9ww0xzOP0suCLDA/yRG1uFcPnTn/Ru6lwAH6nllqV75FQ==} + /@mikro-orm/migrations@5.9.8(@mikro-orm/core@5.9.8): + resolution: {integrity: sha512-D4s2Hd8TFLimddftC/El4Vtiq6AcGG/lc7+LUHieVzkAfdvcddxnxYQ3q1qH7IxqdDWNcZr0dYPxqLvgFhYqqg==} engines: {node: '>= 14.0.0'} peerDependencies: '@mikro-orm/core': ^5.0.0 dependencies: - '@mikro-orm/core': 5.9.7(@mikro-orm/migrations@5.9.7)(@mikro-orm/postgresql@5.9.7) - '@mikro-orm/knex': 5.9.7(@mikro-orm/core@5.9.7)(@mikro-orm/migrations@5.9.7)(pg@8.11.3) + '@mikro-orm/core': 5.9.8(@mikro-orm/migrations@5.9.8)(@mikro-orm/postgresql@5.9.8) + '@mikro-orm/knex': 5.9.8(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8)(pg@8.11.3) fs-extra: 11.1.1 knex: 2.5.1(pg@8.11.3) umzug: 3.3.1 @@ -6344,7 +6344,7 @@ packages: - supports-color - tedious - /@mikro-orm/nestjs@5.2.3(@mikro-orm/core@5.9.7)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3): + /@mikro-orm/nestjs@5.2.3(@mikro-orm/core@5.9.8)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3): resolution: {integrity: sha512-JMxaXrNXlo6j59D3LWMC1tEC1a5JanCtqdfv91JUH0sfVZh97SsjQ9K794BY3JWIUKSFyQwpnLxYZ0Ash/BlPA==} engines: {node: '>= 14.0.0'} peerDependencies: @@ -6352,12 +6352,12 @@ packages: '@nestjs/common': ^8.0.0 || ^9.0.0 || ^10.0.0 '@nestjs/core': ^8.0.0 || ^9.0.0 || ^10.0.0 dependencies: - '@mikro-orm/core': 5.9.7(@mikro-orm/migrations@5.9.7)(@mikro-orm/postgresql@5.9.7) + '@mikro-orm/core': 5.9.8(@mikro-orm/migrations@5.9.8)(@mikro-orm/postgresql@5.9.8) '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.13.2)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/core': 9.4.3(@nestjs/common@9.4.3)(@nestjs/platform-express@9.4.3)(reflect-metadata@0.1.14)(rxjs@7.8.1) - /@mikro-orm/postgresql@5.9.7(@mikro-orm/core@5.9.7)(@mikro-orm/migrations@5.9.7): - resolution: {integrity: sha512-GbWWR/1QWjqTx10I4bjvMQjSN1SDVgNcQYm0kiY54sGvRxOqam55aiwA3Hb9Jp4myyKufKfDjAU0lCFmlpTWyQ==} + /@mikro-orm/postgresql@5.9.8(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8): + resolution: {integrity: sha512-ALXHS9fb3B93RozuF8n3+gYZz/I+d8Swo/5hmcMbaQN4Zs8hhHOhmjfwIj83IWb1QBPYcBeIc2M8TCmhxXX//g==} engines: {node: '>= 14.0.0'} peerDependencies: '@mikro-orm/core': ^5.0.0 @@ -6372,10 +6372,11 @@ packages: '@mikro-orm/seeder': optional: true dependencies: - '@mikro-orm/core': 5.9.7(@mikro-orm/migrations@5.9.7)(@mikro-orm/postgresql@5.9.7) - '@mikro-orm/knex': 5.9.7(@mikro-orm/core@5.9.7)(@mikro-orm/migrations@5.9.7)(pg@8.11.3) - '@mikro-orm/migrations': 5.9.7(@mikro-orm/core@5.9.7) + '@mikro-orm/core': 5.9.8(@mikro-orm/migrations@5.9.8)(@mikro-orm/postgresql@5.9.8) + '@mikro-orm/knex': 5.9.8(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8)(pg@8.11.3) + '@mikro-orm/migrations': 5.9.8(@mikro-orm/core@5.9.8) pg: 8.11.3 + postgres-date: 2.1.0 transitivePeerDependencies: - better-sqlite3 - mssql @@ -13748,6 +13749,7 @@ packages: /glob@8.1.0: resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} engines: {node: '>=12'} + deprecated: Glob versions prior to v9 are no longer supported dependencies: fs.realpath: 1.0.0 inflight: 1.0.6 @@ -16830,8 +16832,8 @@ packages: braces: 3.0.2 picomatch: 2.3.1 - /mikro-orm@5.9.7: - resolution: {integrity: sha512-0AxNDxQWk45n5N5g5q/K2tVj1/Narf4h5+1fhFc0uYAp/tOGAGvjmVK43Xy4TisEm/1VpBNOtS7FYKvh14WVOQ==} + /mikro-orm@5.9.8: + resolution: {integrity: sha512-iBku1gU9xkA2FCw2wy0K4x3EQzsRE52dYGkGUVQEthRmc/vIMBwXyiTAj+oARzXrkWqslFtlZA/2upeqZhMQlw==} engines: {node: '>= 14.0.0'} /mime-db@1.52.0: @@ -18401,6 +18403,10 @@ packages: resolution: {integrity: sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==} engines: {node: '>=0.10.0'} + /postgres-date@2.1.0: + resolution: {integrity: sha512-K7Juri8gtgXVcDfZttFKVmhglp7epKb1K4pgrkLxehjqkrgPhfG6OO8LHLkfaqkbpjNRnra018XwAr1yQFWGcA==} + engines: {node: '>=12'} + /postgres-interval@1.2.0: resolution: {integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==} engines: {node: '>=0.10.0'} From 2f15a01432a6c924585984f2f99eac0206264fc3 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Sun, 1 Sep 2024 09:18:58 +0200 Subject: [PATCH 04/45] API: Provide strategyName in createStaticCredentialsBasicStrategy --- demo/api/src/app.module.ts | 1 + demo/api/src/auth/auth.module.ts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/demo/api/src/app.module.ts b/demo/api/src/app.module.ts index 38b0765d..c21e2cc3 100644 --- a/demo/api/src/app.module.ts +++ b/demo/api/src/app.module.ts @@ -78,6 +78,7 @@ export class AppModule { authModule, UserPermissionsModule.forRootAsync({ useFactory: (accessControlService: AccessControlService) => ({ + systemUsers: ["system-user"], availableContentScopes: [ { domain: "main", language: "en" }, { domain: "main", language: "de" }, diff --git a/demo/api/src/auth/auth.module.ts b/demo/api/src/auth/auth.module.ts index 1e58f77e..ba293f23 100644 --- a/demo/api/src/auth/auth.module.ts +++ b/demo/api/src/auth/auth.module.ts @@ -14,6 +14,7 @@ export class AuthModule { createStaticCredentialsBasicStrategy({ username: "vivid", password: config.auth.basicAuthPassword, + strategyName: "system-user", }), createAuthProxyJwtStrategy({ jwksUri: config.auth.idpJwksUri, @@ -24,7 +25,7 @@ export class AuthModule { }), { provide: APP_GUARD, - useClass: createCometAuthGuard(["auth-proxy-jwt", "static-credentials-basic"]), + useClass: createCometAuthGuard(["auth-proxy-jwt", "system-user"]), }, AccessControlService, ], From c2756d7449c6b175b7b72b878d1b8aa8f0473e3e Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Sun, 1 Sep 2024 09:20:06 +0200 Subject: [PATCH 05/45] API: Remove language from user --- demo/api/src/auth/auth-local.module.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/demo/api/src/auth/auth-local.module.ts b/demo/api/src/auth/auth-local.module.ts index d535bfaa..a154e0a9 100644 --- a/demo/api/src/auth/auth-local.module.ts +++ b/demo/api/src/auth/auth-local.module.ts @@ -21,7 +21,6 @@ export class AuthLocalModule { id: "10f266b8-ec2e-4a0c-98ec-2cfacceda1b7", name: "Test Admin", email: "demo@comet-dxp.com", - language: "en", }, }), createAuthResolver({ From 09bb8fa8685fe17c44363aa392f30f00c9fd5dea Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Sun, 1 Sep 2024 09:24:04 +0200 Subject: [PATCH 06/45] API: Rename PublicApi and DisableGlobalGuard to DisableCometGuards --- .../src/brevo-contact/brevo-contact-subscribe.controller.ts | 4 ++-- .../brevo-transactional-mails.controller.ts | 4 ++-- demo/api/src/status/status.controller.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/demo/api/src/brevo-contact/brevo-contact-subscribe.controller.ts b/demo/api/src/brevo-contact/brevo-contact-subscribe.controller.ts index 5fb800cd..233c6004 100644 --- a/demo/api/src/brevo-contact/brevo-contact-subscribe.controller.ts +++ b/demo/api/src/brevo-contact/brevo-contact-subscribe.controller.ts @@ -1,5 +1,5 @@ import { BrevoContactsService, SubscribeResponse } from "@comet/brevo-api"; -import { DisableGlobalGuard } from "@comet/cms-api"; +import { DisableCometGuards } from "@comet/cms-api"; import { Body, Controller, Post } from "@nestjs/common"; import { BrevoContactSubscribeInput } from "./dto/brevo-contact-subscribe.input"; @@ -8,7 +8,7 @@ import { BrevoContactSubscribeInput } from "./dto/brevo-contact-subscribe.input" export class BrevoContactSubscribeController { constructor(private readonly brevoContactsService: BrevoContactsService) {} - @DisableGlobalGuard() + @DisableCometGuards() @Post(`/subscribe`) async subscribe(@Body() data: BrevoContactSubscribeInput): Promise { // Here, the application should add logic to handle reCAPTCHA verification diff --git a/demo/api/src/brevo-transactional-mails/brevo-transactional-mails.controller.ts b/demo/api/src/brevo-transactional-mails/brevo-transactional-mails.controller.ts index 81e1129c..289755d5 100644 --- a/demo/api/src/brevo-transactional-mails/brevo-transactional-mails.controller.ts +++ b/demo/api/src/brevo-transactional-mails/brevo-transactional-mails.controller.ts @@ -1,5 +1,5 @@ import { BrevoTransactionalMailsService } from "@comet/brevo-api"; -import { DisableGlobalGuard } from "@comet/cms-api"; +import { DisableCometGuards } from "@comet/cms-api"; import { Body, Controller, Post } from "@nestjs/common"; import { BrevoTransactionalMailsBody } from "./dto/transactional-mails.body"; @@ -8,7 +8,7 @@ import { BrevoTransactionalMailsBody } from "./dto/transactional-mails.body"; export class BrevoTransactionalMailsController { constructor(private readonly brevoTransactionalMailsService: BrevoTransactionalMailsService) {} - @DisableGlobalGuard() + @DisableCometGuards() @Post(`/send`) async send(@Body() { text, subject, to, scope }: BrevoTransactionalMailsBody): Promise { await this.brevoTransactionalMailsService.send({ to: [{ email: to }], textContent: text, subject }, scope); diff --git a/demo/api/src/status/status.controller.ts b/demo/api/src/status/status.controller.ts index 3132e1fa..e25d80bf 100644 --- a/demo/api/src/status/status.controller.ts +++ b/demo/api/src/status/status.controller.ts @@ -1,9 +1,9 @@ -import { PublicApi } from "@comet/cms-api"; +import { DisableCometGuards } from "@comet/cms-api"; import { EntityManager } from "@mikro-orm/postgresql"; import { Controller, Get } from "@nestjs/common"; @Controller("status") -@PublicApi() +@DisableCometGuards() export class StatusController { constructor(private readonly entityManager: EntityManager) {} From 737df7a0e2e16a44703b8e6926b9004dadc37946 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Sun, 1 Sep 2024 09:27:00 +0200 Subject: [PATCH 07/45] API: Add changes to 'Support dependency injection in BlockData#transformToPlain' --- demo/api/src/app.module.ts | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/demo/api/src/app.module.ts b/demo/api/src/app.module.ts index c21e2cc3..5dad7190 100644 --- a/demo/api/src/app.module.ts +++ b/demo/api/src/app.module.ts @@ -1,22 +1,19 @@ import { BrevoModule } from "@comet/brevo-api"; import { BlobStorageModule, - BLOCKS_MODULE_TRANSFORMER_DEPENDENCIES, BlocksModule, BlocksTransformerMiddlewareFactory, BuildsModule, DamModule, DependenciesModule, - FilesService, - ImagesService, KubernetesModule, PageTreeModule, - PageTreeService, RedirectsModule, UserPermissionsModule, } from "@comet/cms-api"; import { ApolloDriver } from "@nestjs/apollo"; import { DynamicModule, Module } from "@nestjs/common"; +import { ModuleRef } from "@nestjs/core"; import { Enhancer, GraphQLModule } from "@nestjs/graphql"; import { DbModule } from "@src/db/db.module"; import { Link } from "@src/documents/links/entities/link.entity"; @@ -55,7 +52,7 @@ export class AppModule { GraphQLModule.forRootAsync({ driver: ApolloDriver, imports: [BlocksModule], - useFactory: (dependencies: Record) => ({ + useFactory: (moduleRef: ModuleRef) => ({ debug: config.debug, playground: config.debug, autoSchemaFile: "schema.gql", @@ -70,10 +67,10 @@ export class AppModule { // See https://docs.nestjs.com/graphql/other-features#execute-enhancers-at-the-field-resolver-level fieldResolverEnhancers: ["guards", "interceptors", "filters"] as Enhancer[], buildSchemaOptions: { - fieldMiddleware: [BlocksTransformerMiddlewareFactory.create(dependencies)], + fieldMiddleware: [BlocksTransformerMiddlewareFactory.create(moduleRef)], }, }), - inject: [BLOCKS_MODULE_TRANSFORMER_DEPENDENCIES], + inject: [ModuleRef], }), authModule, UserPermissionsModule.forRootAsync({ @@ -90,19 +87,7 @@ export class AppModule { inject: [AccessControlService], imports: [authModule], }), - BlocksModule.forRoot({ - imports: [PageTreeModule, DamModule], - useFactory: (pageTreeService: PageTreeService, filesService: FilesService, imagesService: ImagesService) => { - return { - transformerDependencies: { - pageTreeService, - filesService, - imagesService, - }, - }; - }, - inject: [PageTreeService, FilesService, ImagesService], - }), + BlocksModule, KubernetesModule.register({ helmRelease: config.helmRelease, }), From dfc467eeaa32952871778d8250e8ad99e363c9e0 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Sun, 1 Sep 2024 09:33:17 +0200 Subject: [PATCH 08/45] API: Remove CDN env vars and additionalMimeTypes --- .env | 3 --- demo/api/src/app.module.ts | 4 +--- demo/api/src/comet-config.json | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.env b/.env index 5857a47d..83ef4fba 100644 --- a/.env +++ b/.env @@ -33,9 +33,6 @@ IMGPROXY_USE_S3=false # dam DAM_SECRET=6a9e8a185b513363bc89ec0b96eed8f70c759bc86b97319f60365c4b7f8593dc -DAM_CDN_ENABLED="false" -DAM_CDN_DOMAIN= -DAM_CDN_ORIGIN_HEADER= # api API_PORT=4000 diff --git a/demo/api/src/app.module.ts b/demo/api/src/app.module.ts index 5dad7190..78cd6e72 100644 --- a/demo/api/src/app.module.ts +++ b/demo/api/src/app.module.ts @@ -107,12 +107,10 @@ export class AppModule { File: DamFile, Folder: DamFolder, damConfig: { - filesBaseUrl: `${config.apiUrl}/dam/files`, - imagesBaseUrl: `${config.apiUrl}/dam/images`, + apiUrl: config.apiUrl, secret: config.dam.secret, allowedImageSizes: config.dam.allowedImageSizes, allowedAspectRatios: config.dam.allowedImageAspectRatios, - additionalMimeTypes: config.dam.additionalMimeTypes, filesDirectory: `${config.blob.storageDirectoryPrefix}-files`, cacheDirectory: `${config.blob.storageDirectoryPrefix}-cache`, maxFileSize: config.dam.uploadsMaxFileSize, diff --git a/demo/api/src/comet-config.json b/demo/api/src/comet-config.json index a5e92f3e..aaa5c93c 100644 --- a/demo/api/src/comet-config.json +++ b/demo/api/src/comet-config.json @@ -4,7 +4,6 @@ "quality": 80 }, "dam": { - "additionalMimeTypes": [], "uploadsMaxFileSize": 500, "allowedImageSizes": [1200], "allowedImageAspectRatios": ["16x9", "4x3", "3x2", "3x1", "2x1", "1x1", "1x2", "1x3", "2x3", "3x4", "9x16"] From ad1de1b71b0387671fc8e454d62fe66a2c42d209 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Sun, 1 Sep 2024 09:36:13 +0200 Subject: [PATCH 09/45] API: Replace DateFilter with DateTimeFilter --- .../dto/email-campaign.filter.ts | 20 +++++++++---------- .../target-group/dto/target-group.filter.ts | 14 ++++++------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/api/src/email-campaign/dto/email-campaign.filter.ts b/packages/api/src/email-campaign/dto/email-campaign.filter.ts index a94fb90e..1e4f093e 100644 --- a/packages/api/src/email-campaign/dto/email-campaign.filter.ts +++ b/packages/api/src/email-campaign/dto/email-campaign.filter.ts @@ -1,21 +1,21 @@ -import { DateFilter, StringFilter } from "@comet/cms-api"; +import { DateTimeFilter, StringFilter } from "@comet/cms-api"; import { Field, InputType } from "@nestjs/graphql"; import { Type } from "class-transformer"; import { IsOptional, ValidateNested } from "class-validator"; @InputType() export class EmailCampaignFilter { - @Field(() => DateFilter, { nullable: true }) + @Field(() => DateTimeFilter, { nullable: true }) @ValidateNested() @IsOptional() - @Type(() => DateFilter) - createdAt?: DateFilter; + @Type(() => DateTimeFilter) + createdAt?: DateTimeFilter; - @Field(() => DateFilter, { nullable: true }) + @Field(() => DateTimeFilter, { nullable: true }) @ValidateNested() @IsOptional() - @Type(() => DateFilter) - updatedAt?: DateFilter; + @Type(() => DateTimeFilter) + updatedAt?: DateTimeFilter; @Field(() => StringFilter, { nullable: true }) @ValidateNested() @@ -29,11 +29,11 @@ export class EmailCampaignFilter { @Type(() => StringFilter) subject?: StringFilter; - @Field(() => DateFilter, { nullable: true }) + @Field(() => DateTimeFilter, { nullable: true }) @ValidateNested() @IsOptional() - @Type(() => DateFilter) - scheduledAt?: DateFilter; + @Type(() => DateTimeFilter) + scheduledAt?: DateTimeFilter; @Field(() => [EmailCampaignFilter], { nullable: true }) @Type(() => EmailCampaignFilter) diff --git a/packages/api/src/target-group/dto/target-group.filter.ts b/packages/api/src/target-group/dto/target-group.filter.ts index 51ffa319..f25832df 100644 --- a/packages/api/src/target-group/dto/target-group.filter.ts +++ b/packages/api/src/target-group/dto/target-group.filter.ts @@ -1,21 +1,21 @@ -import { DateFilter, StringFilter } from "@comet/cms-api"; +import { DateTimeFilter, StringFilter } from "@comet/cms-api"; import { Field, InputType } from "@nestjs/graphql"; import { Type } from "class-transformer"; import { IsOptional, ValidateNested } from "class-validator"; @InputType() export class TargetGroupFilter { - @Field(() => DateFilter, { nullable: true }) + @Field(() => DateTimeFilter, { nullable: true }) @ValidateNested() @IsOptional() - @Type(() => DateFilter) - createdAt?: DateFilter; + @Type(() => DateTimeFilter) + createdAt?: DateTimeFilter; - @Field(() => DateFilter, { nullable: true }) + @Field(() => DateTimeFilter, { nullable: true }) @ValidateNested() @IsOptional() - @Type(() => DateFilter) - updatedAt?: DateFilter; + @Type(() => DateTimeFilter) + updatedAt?: DateTimeFilter; @Field(() => StringFilter, { nullable: true }) @ValidateNested() From b4bcec55e1fa2ddaf25cfe2f09a13c256a60ad12 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Sun, 1 Sep 2024 09:37:10 +0200 Subject: [PATCH 10/45] API: Import YouTubeVideoBlock from @comet/cms-api package --- demo/api/src/documents/pages/blocks/page-content.block.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/api/src/documents/pages/blocks/page-content.block.ts b/demo/api/src/documents/pages/blocks/page-content.block.ts index ab3bc0ba..0fb130f7 100644 --- a/demo/api/src/documents/pages/blocks/page-content.block.ts +++ b/demo/api/src/documents/pages/blocks/page-content.block.ts @@ -1,5 +1,5 @@ -import { createBlocksBlock, SpaceBlock, YouTubeVideoBlock } from "@comet/blocks-api"; -import { DamImageBlock, DamVideoBlock } from "@comet/cms-api"; +import { createBlocksBlock, SpaceBlock } from "@comet/blocks-api"; +import { DamImageBlock, DamVideoBlock, YouTubeVideoBlock } from "@comet/cms-api"; import { HeadlineBlock } from "@src/common/blocks/headline.block"; import { LinkListBlock } from "@src/common/blocks/link-list.block"; import { RichTextBlock } from "@src/common/blocks/rich-text.block"; From 8b30b0ddd64f3183b8419c3244476f137dbf2a66 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Sun, 1 Sep 2024 09:41:49 +0200 Subject: [PATCH 11/45] Admin: Update to COMET v7.2.1 --- demo/admin/package.json | 16 +-- packages/admin/package.json | 24 ++--- pnpm-lock.yaml | 206 ++++++++++++++++-------------------- 3 files changed, 110 insertions(+), 136 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 23716011..e9fd564c 100644 --- 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": "^6.8.0", - "@comet/admin-icons": "^6.8.0", - "@comet/admin-rte": "^6.8.0", - "@comet/admin-theme": "^6.8.0", - "@comet/blocks-admin": "^6.8.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/brevo-admin": "workspace:*", - "@comet/cms-admin": "^6.8.0", + "@comet/cms-admin": "^7.2.1", "@emotion/react": "^11.9.3", "@emotion/styled": "^11.9.3", "@fontsource/roboto": "^4.5.8", @@ -64,8 +64,8 @@ "react-router-dom": "^5.1.2" }, "devDependencies": { - "@comet/cli": "^6.8.0", - "@comet/eslint-config": "^6.8.0", + "@comet/cli": "^7.2.1", + "@comet/eslint-config": "^7.2.1", "@emotion/babel-plugin": "^11.0.0", "@formatjs/cli": "^3.0.1", "@gitbeaker/node": "^35.6.0", diff --git a/packages/admin/package.json b/packages/admin/package.json index 6a4d5435..88b7d3ea 100644 --- 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": "^6.8.0", - "@comet/admin-babel-preset": "^6.8.0", - "@comet/admin-date-time": "^6.8.0", - "@comet/admin-icons": "^6.8.0", - "@comet/blocks-admin": "^6.8.0", - "@comet/cms-admin": "^6.8.0", - "@comet/eslint-config": "^6.8.0", + "@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", "@emotion/react": "^11.9.3", "@emotion/styled": "^11.9.3", "@graphql-codegen/cli": "^2.0.0", @@ -77,11 +77,11 @@ }, "peerDependencies": { "@apollo/client": "^3.2.5", - "@comet/admin": "^6.0.0", - "@comet/admin-date-time": "^6.0.0", - "@comet/admin-icons": "^6.0.0", - "@comet/blocks-admin": "^6.0.0", - "@comet/cms-admin": "^6.0.0", + "@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", "@emotion/react": "^11.9.3", "@emotion/styled": "^11.9.3", "@mui/icons-material": "^5.8.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dd6aeaff..d80388d5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -54,26 +54,26 @@ importers: specifier: ^7.0.0 version: 7.23.7 '@comet/admin': - specifier: ^6.8.0 - version: 6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + specifier: ^7.2.1 + version: 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/admin-icons': - specifier: ^6.8.0 - version: 6.8.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + specifier: ^7.2.1 + version: 7.2.1(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) '@comet/admin-rte': - specifier: ^6.8.0 - version: 6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + specifier: ^7.2.1 + version: 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/admin-theme': - specifier: ^6.8.0 - version: 6.8.0(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) + specifier: ^7.2.1 + version: 7.2.1(@mui/material@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@comet/blocks-admin': - specifier: ^6.8.0 - version: 6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + specifier: ^7.2.1 + version: 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/brevo-admin': specifier: workspace:* version: link:../../packages/admin '@comet/cms-admin': - specifier: ^6.8.0 - version: 6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(axios@0.21.4)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd-html5-backend@16.0.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + specifier: ^7.2.1 + version: 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd-html5-backend@16.0.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@emotion/react': specifier: ^11.9.3 version: 11.11.3(@types/react@17.0.75)(react@17.0.2) @@ -166,11 +166,11 @@ importers: version: 5.3.4(react@17.0.2) devDependencies: '@comet/cli': - specifier: ^6.8.0 - version: 6.8.0 + specifier: ^7.2.1 + version: 7.2.1(ts-node@10.9.2) '@comet/eslint-config': - specifier: ^6.8.0 - version: 6.8.0(eslint@8.56.0)(next@12.3.4)(prettier@2.8.8)(typescript@4.9.5) + specifier: ^7.2.1 + version: 7.2.1(eslint@8.56.0)(prettier@2.8.8)(ts-jest@29.1.1)(typescript@4.9.5) '@emotion/babel-plugin': specifier: ^11.0.0 version: 11.11.0 @@ -815,26 +815,26 @@ importers: specifier: ^7.20.12 version: 7.23.7 '@comet/admin': - specifier: ^6.8.0 - version: 6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + specifier: ^7.2.1 + version: 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/admin-babel-preset': - specifier: ^6.8.0 - version: 6.8.0(@babel/cli@7.23.4) + specifier: ^7.2.1 + version: 7.2.1(@babel/cli@7.23.4) '@comet/admin-date-time': - specifier: ^6.8.0 - version: 6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + specifier: ^7.2.1 + version: 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/admin-icons': - specifier: ^6.8.0 - version: 6.8.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + specifier: ^7.2.1 + version: 7.2.1(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) '@comet/blocks-admin': - specifier: ^6.8.0 - version: 6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + specifier: ^7.2.1 + version: 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/cms-admin': - specifier: ^6.8.0 - version: 6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(axios@0.21.4)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd-html5-backend@16.0.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + specifier: ^7.2.1 + version: 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd-html5-backend@16.0.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/eslint-config': - specifier: ^6.8.0 - version: 6.8.0(eslint@8.56.0)(next@12.3.4)(prettier@2.8.8)(typescript@4.9.5) + specifier: ^7.2.1 + version: 7.2.1(eslint@8.56.0)(prettier@2.8.8)(ts-jest@29.1.1)(typescript@4.9.5) '@emotion/react': specifier: ^11.9.3 version: 11.11.3(@types/react@17.0.75)(react@17.0.2) @@ -3731,8 +3731,8 @@ packages: dev: true optional: true - /@comet/admin-babel-preset@6.8.0(@babel/cli@7.23.4): - resolution: {integrity: sha512-DeV6vC0BoyQobXgYSU6Erk6CcFBu6pP/wj8spDOVk8MDjyxzYIcyOZRLKtwM7E03Ig34XbGRylElIzvNicSqGQ==} + /@comet/admin-babel-preset@7.2.1(@babel/cli@7.23.4): + resolution: {integrity: sha512-PaTwSGZt8DybquOgqgmYGOxQGFQZEjlYSFjWShYrM3asMS++JYAv2213rEmU9a89wT2buzv7XsOLYhFrbfR7Zw==} peerDependencies: '@babel/cli': '>= 7' dependencies: @@ -3747,20 +3747,18 @@ packages: - supports-color dev: true - /@comet/admin-date-time@6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): - resolution: {integrity: sha512-umYoHvB7aP+4lCn8LDcdkGVtjzMDPGwNlZYzIK5fFKHpJlcgzR3oam32dwbrwLT7mQsWncIUga48UGxh7nKrmg==} + /@comet/admin-date-time@7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): + resolution: {integrity: sha512-TRqp0T6l91epoSAmzLc/U9KtOJanw9LtwC0WigzFnXWDjLtUoBBqdV5tJ3uPzR/Rgc4c5F2QeKFWeo5WCGz8Pw==} peerDependencies: '@mui/material': ^5.0.0 - '@mui/styles': ^5.0.0 react: ^17.0 react-dom: ^17.0 react-final-form: ^6.5.7 - react-intl: ^5.24.6 + react-intl: ^5.0.0 || ^6.0.0 dependencies: - '@comet/admin': 6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) - '@comet/admin-icons': 6.8.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin': 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/admin-icons': 7.2.1(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) - '@mui/styles': 5.15.5(@types/react@17.0.75)(react@17.0.2) '@mui/utils': 5.15.5(@types/react@17.0.75)(react@17.0.2) clsx: 1.2.1 date-fns: 2.30.0 @@ -3773,7 +3771,7 @@ packages: - '@apollo/client' - '@emotion/react' - '@emotion/styled' - - '@mui/icons-material' + - '@mui/system' - '@mui/x-data-grid' - '@mui/x-data-grid-premium' - '@mui/x-data-grid-pro' @@ -3785,8 +3783,8 @@ packages: - react-router - react-router-dom - /@comet/admin-icons@6.8.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2): - resolution: {integrity: sha512-JUw6qd+JGLbpeA/905zyIaWjlj+p/Lr9kwNFLVk6VkrD8JlfQ22MODDRINiIYKslNxAjfhve0jA92sxIYreFrw==} + /@comet/admin-icons@7.2.1(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2): + resolution: {integrity: sha512-xUWVdkMcFv0ioDNRuHGSwxXd1JpP2tyXfH+Yo6LNSfHBssCVVk8QV8rD2VeurJO4fe16XX7IKgxkCzQRQJ7uXQ==} peerDependencies: '@mui/material': ^5.0.0 react: ^17.0 @@ -3796,24 +3794,20 @@ packages: react: 17.0.2 react-dom: 17.0.2(react@17.0.2) - /@comet/admin-rte@6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): - resolution: {integrity: sha512-c7fhxRk3plCpkfj2DBDQfwZvYpwvowmGULiDW1FByKqnLVV5bmS9jFGtZDgpRe6SGFHEjKLa5TGAU2my44qmqA==} + /@comet/admin-rte@7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): + resolution: {integrity: sha512-95Z/DZzvjW045ZpsUaNUvw+XgG0IACVCwW+T5lWi/1vxobUwjpAitgObN6msSwNPiKSsTFwwbum0vy8jfK03RQ==} peerDependencies: - '@mui/icons-material': ^5.0.0 '@mui/material': ^5.0.0 - '@mui/styles': ^5.0.0 draft-js: ^0.11.4 final-form: ^4.16.1 react: ^17.0 react-dom: ^17.0 react-final-form: ^6.3.1 - react-intl: ^5.10.0 + react-intl: ^5.0.0 || ^6.0.0 dependencies: - '@comet/admin': 6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) - '@comet/admin-icons': 6.8.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) - '@mui/icons-material': 5.14.5(@mui/material@5.15.5)(@types/react@17.0.75)(react@17.0.2) + '@comet/admin': 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/admin-icons': 7.2.1(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) - '@mui/styles': 5.15.5(@types/react@17.0.75)(react@17.0.2) detect-browser: 5.3.0 draft-js: 0.11.7(react-dom@17.0.2)(react@17.0.2) draft-js-export-html: 1.4.1(draft-js@0.11.7)(immutable@3.7.6) @@ -3829,6 +3823,7 @@ packages: - '@apollo/client' - '@emotion/react' - '@emotion/styled' + - '@mui/system' - '@mui/x-data-grid' - '@mui/x-data-grid-premium' - '@mui/x-data-grid-pro' @@ -3839,17 +3834,15 @@ packages: - react-router - react-router-dom - /@comet/admin-theme@6.8.0(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2): - resolution: {integrity: sha512-dfitsWnVVFMLVpvph+86P9a+u3WxG23+O3MtEJIbsUjMQ5nyIw2gfg36dmY0V656wDyvWpP4ZX44eme3R8RvpQ==} + /@comet/admin-theme@7.2.1(@mui/material@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2): + resolution: {integrity: sha512-bC9a1c5AMC1ivWtvWOzXQGf2OYRUkxVZn4O34imu1SmttBRlA3Z5sN7xVOVmTpKCo4CccD2P8iSIBx8SQDFk0g==} peerDependencies: '@mui/material': ^5.0.0 - '@mui/styles': ^5.0.0 '@mui/system': ^5.0.0 react: ^17.0 dependencies: - '@comet/admin-icons': 6.8.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin-icons': 7.2.1(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) - '@mui/styles': 5.15.5(@types/react@17.0.75)(react@17.0.2) '@mui/system': 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react@17.0.2) '@mui/utils': 5.15.5(@types/react@17.0.75)(react@17.0.2) react: 17.0.2 @@ -3857,15 +3850,13 @@ packages: - '@types/react' - react-dom - /@comet/admin@6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): - resolution: {integrity: sha512-8B6pgqdOsBLO3ghDyOgU+AVOk+LvsMmFuuUzJp8tUYXcA7lUFvPdsZqMgHmeaGOJApA/zO3AQ/evZ0DxDlMeWw==} + /@comet/admin@7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): + resolution: {integrity: sha512-gEXCCQvM+5BnoCWfNiUo1tcpliQgNyNJk73pg3MQ3tycjAV2FyOYL7NNeo+7bCd2gE1mqFqy9CvzlIdPPBrNLQ==} peerDependencies: '@apollo/client': ^3.7.0 '@emotion/react': ^11.5.0 '@emotion/styled': ^11.3.0 - '@mui/icons-material': ^5.0.0 '@mui/material': ^5.0.0 - '@mui/styles': ^5.0.0 '@mui/x-data-grid': ^5.0.0 '@mui/x-data-grid-premium': ^5.0.0 '@mui/x-data-grid-pro': ^5.0.0 @@ -3876,7 +3867,7 @@ packages: react-dnd: ^16.0.0 react-dom: ^17.0 react-final-form: ^6.3.1 - react-intl: ^5.10.0 + react-intl: ^5.0.0 || ^6.0.0 react-router: ^5.1.2 react-router-dom: ^5.1.2 peerDependenciesMeta: @@ -3888,13 +3879,13 @@ packages: optional: true dependencies: '@apollo/client': 3.8.9(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) - '@comet/admin-icons': 6.8.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin-icons': 7.2.1(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin-theme': 7.2.1(@mui/material@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@emotion/react': 11.11.3(@types/react@17.0.75)(react@17.0.2) '@emotion/styled': 11.11.0(@emotion/react@11.11.3)(@types/react@17.0.75)(react@17.0.2) - '@mui/icons-material': 5.14.5(@mui/material@5.15.5)(@types/react@17.0.75)(react@17.0.2) + '@mui/lab': 5.0.0-alpha.161(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@mui/private-theming': 5.15.5(@types/react@17.0.75)(react@17.0.2) - '@mui/styles': 5.15.5(@types/react@17.0.75)(react@17.0.2) '@mui/x-data-grid': 5.17.26(@mui/material@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) clsx: 1.2.1 exceljs: 3.10.0 @@ -3911,6 +3902,7 @@ packages: react: 17.0.2 react-dnd: 16.0.1(@types/node@18.19.8)(@types/react@17.0.75)(react@17.0.2) react-dom: 17.0.2(react@17.0.2) + react-dropzone: 14.2.3(react@17.0.2) react-final-form: 6.5.9(final-form@4.20.10)(react@17.0.2) react-intl: 5.25.1(react@17.0.2)(typescript@4.9.5) react-router: 5.3.4(react@17.0.2) @@ -3918,26 +3910,25 @@ packages: use-constant: 1.1.1(react@17.0.2) uuid: 9.0.1 transitivePeerDependencies: + - '@mui/system' - '@types/react' - /@comet/blocks-admin@6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): - resolution: {integrity: sha512-fAO8G4z65c4XdEhPmjhDktetmg+8qc7XdRcGyPTYQmQFBLRXBgFrddJCKAIo+KJoXfTYDdCfWl9aVElNDkK91Q==} + /@comet/blocks-admin@7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): + resolution: {integrity: sha512-FgWAx+H+z68RM5G1wAEGdCAREOTbXVFnDDNuFhgKr7XSdaIxubdKpxZiwuABoFKRzqprsERUHtRKH7hdAwR7xg==} peerDependencies: '@mui/material': ^5.0.0 - '@mui/styles': ^5.0.0 react: ^16.8.0 || ^17.0.0 react-dnd: ^16.0.0 react-dom: ^16.8.0 || ^17.0.0 react-final-form: ^6.0.0 - react-intl: ^5.0.0 + react-intl: ^5.0.0 || ^6.0.0 react-router: ^5.0.0 react-router-dom: ^5.0.0 dependencies: - '@comet/admin': 6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) - '@comet/admin-icons': 6.8.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin': 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/admin-icons': 7.2.1(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) '@mui/lab': 5.0.0-alpha.161(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) - '@mui/styles': 5.15.5(@types/react@17.0.75)(react@17.0.2) clipboard-copy: 4.0.1 clsx: 1.2.1 lodash.isequal: 4.5.0 @@ -3955,7 +3946,7 @@ packages: - '@apollo/client' - '@emotion/react' - '@emotion/styled' - - '@mui/icons-material' + - '@mui/system' - '@mui/x-data-grid' - '@mui/x-data-grid-premium' - '@mui/x-data-grid-pro' @@ -3990,18 +3981,26 @@ packages: prettier: 2.8.8 dev: true - /@comet/cms-admin@6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(axios@0.21.4)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd-html5-backend@16.0.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): - resolution: {integrity: sha512-bwtCaw6XknQVjYHlsRSUrpGbPK4SMjSsDJDfF1D+UUD70m6WyLsZTkgAHR92y7pv/MV+MZqpZ6ir0nleOiMSVg==} + /@comet/cli@7.2.1(ts-node@10.9.2): + resolution: {integrity: sha512-iAgZWyGftfvbs6+qyR0Bkq2EPbPNsHU52bKQnsLoRuF/qo6YtrxcKFu7rHvSp24/7AO9/wU3QqkG8Ab2q7ruwQ==} + hasBin: true + peerDependencies: + ts-node: ^10.9.1 + dependencies: + commander: 9.5.0 + prettier: 2.8.8 + ts-node: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) + dev: true + + /@comet/cms-admin@7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd-html5-backend@16.0.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): + resolution: {integrity: sha512-mfMQFQji2UKc1dtLjV7gVzpSakUgJMmeb+q9GUcaoaObXJDMktHwcx65DT71uiz1QcDBLGpJuogDkoEcjpy3CQ==} hasBin: true peerDependencies: '@apollo/client': ^3.7.0 '@emotion/react': ^11.5.0 '@emotion/styled': ^11.3.0 - '@mui/icons-material': ^5.0.0 '@mui/material': ^5.0.0 - '@mui/styles': ^5.0.0 '@mui/x-data-grid': ^5.0.0 - axios: ^0.21.0 final-form: ^4.0.0 graphql: ^15.0.0 || ^16.0.0 react: ^16.8.0 || ^17.0.0 @@ -4009,28 +4008,27 @@ packages: react-dnd-html5-backend: ^16.0.0 react-dom: ^16.8.0 || ^17.0.0 react-final-form: ^6.0.0 - react-intl: ^5.0.0 + react-intl: ^5.0.0 || ^6.0.0 react-router: ^5.0.0 react-router-dom: ^5.0.0 dependencies: '@apollo/client': 3.8.9(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) - '@comet/admin': 6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) - '@comet/admin-date-time': 6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) - '@comet/admin-icons': 6.8.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) - '@comet/admin-rte': 6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) - '@comet/admin-theme': 6.8.0(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) - '@comet/blocks-admin': 6.8.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.5)(@mui/material@5.15.5)(@mui/styles@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/admin': 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/admin-date-time': 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/admin-icons': 7.2.1(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin-rte': 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/admin-theme': 7.2.1(@mui/material@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) + '@comet/blocks-admin': 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@emotion/react': 11.11.3(@types/react@17.0.75)(react@17.0.2) '@emotion/styled': 11.11.0(@emotion/react@11.11.3)(@types/react@17.0.75)(react@17.0.2) '@graphql-tools/graphql-file-loader': 7.5.17(graphql@15.8.0) '@graphql-tools/load': 7.8.14(graphql@15.8.0) '@graphql-typed-document-node/core': 3.2.0(graphql@15.8.0) - '@mui/icons-material': 5.14.5(@mui/material@5.15.5)(@types/react@17.0.75)(react@17.0.2) '@mui/lab': 5.0.0-alpha.161(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) - '@mui/styles': 5.15.5(@types/react@17.0.75)(react@17.0.2) '@mui/x-data-grid': 5.17.26(@mui/material@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) axios: 0.21.4 + change-case: 4.1.2 class-validator: 0.13.2 clsx: 1.2.1 commander: 10.0.1 @@ -4047,6 +4045,7 @@ packages: lodash.isequal: 4.5.0 lodash.set: 4.3.2 mime-db: 1.52.0 + object-path: 0.11.8 p-debounce: 4.0.0 pluralize: 8.0.0 prop-types: 15.8.1 @@ -4058,7 +4057,6 @@ packages: react-dropzone: 14.2.3(react@17.0.2) react-final-form: 6.5.9(final-form@4.20.10)(react@17.0.2) react-final-form-arrays: 3.1.4(final-form-arrays@3.1.0)(final-form@4.20.10)(react-final-form@6.5.9)(react@17.0.2) - react-final-form-listeners: 1.0.3(final-form@4.20.10)(prop-types@15.8.1)(react-final-form@6.5.9)(react@17.0.2) react-hotkeys-hook: 3.4.7(react-dom@17.0.2)(react@17.0.2) react-image-crop: 8.6.12(react@17.0.2) react-intl: 5.25.1(react@17.0.2)(typescript@4.9.5) @@ -4077,6 +4075,7 @@ packages: - '@mui/x-data-grid-premium' - '@mui/x-data-grid-pro' - '@types/react' + - debug - draft-js - history @@ -10940,7 +10939,6 @@ packages: dependencies: pascal-case: 3.1.2 tslib: 2.6.2 - dev: true /camelcase-keys@6.2.2: resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==} @@ -10989,7 +10987,6 @@ packages: no-case: 3.0.4 tslib: 2.6.2 upper-case-first: 2.0.2 - dev: true /caseless@0.12.0: resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==} @@ -11059,7 +11056,6 @@ packages: sentence-case: 3.0.4 snake-case: 3.0.4 tslib: 2.6.2 - dev: true /change-case@5.4.2: resolution: {integrity: sha512-WB3UiTDpT+vrTilAWaJS4gaIH/jc1He4H9f6erQvraUYas90uWT0JOYFkG1imdNv710XJ6gJvqynrgOHc4ihDA==} @@ -11454,7 +11450,6 @@ packages: no-case: 3.0.4 tslib: 2.6.2 upper-case: 2.0.2 - dev: true /content-disposition@0.5.4: resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==} @@ -12136,7 +12131,6 @@ packages: dependencies: no-case: 3.0.4 tslib: 2.6.2 - dev: true /dotenv-cli@6.0.0: resolution: {integrity: sha512-qXlCOi3UMDhCWFKe0yq5sg3X+pJAz+RQDiFN38AMSbUrnY3uZshSfDJUAge951OS7J9gwLZGfsBlWRSOYz/TRg==} @@ -14026,7 +14020,6 @@ packages: dependencies: capital-case: 1.0.4 tslib: 2.6.2 - dev: true /helmet@4.6.0: resolution: {integrity: sha512-HVqALKZlR95ROkrnesdhbbZJFi/rIVSoNq6f3jA/9u6MIbTsPh3xZwihjeI5+DO/2sOV6HMHooXcEOuwskHpTg==} @@ -16616,7 +16609,6 @@ packages: resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==} dependencies: tslib: 2.6.2 - dev: true /lowercase-keys@2.0.0: resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==} @@ -17533,7 +17525,6 @@ packages: dependencies: lower-case: 2.0.2 tslib: 2.6.2 - dev: true /node-abort-controller@3.1.1: resolution: {integrity: sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==} @@ -17690,6 +17681,10 @@ packages: resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} engines: {node: '>= 0.4'} + /object-path@0.11.8: + resolution: {integrity: sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA==} + engines: {node: '>= 10.12.0'} + /object.assign@4.1.5: resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==} engines: {node: '>= 0.4'} @@ -17978,7 +17973,6 @@ packages: dependencies: dot-case: 3.0.4 tslib: 2.6.2 - dev: true /parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} @@ -18045,7 +18039,6 @@ packages: dependencies: no-case: 3.0.4 tslib: 2.6.2 - dev: true /passport-custom@1.1.1: resolution: {integrity: sha512-/2m7jUGxmCYvoqenLB9UrmkCgPt64h8ZtV+UtuQklZ/Tn1NpKBeOorCYkB/8lMRoiZ5hUrCoMmDtxCS/d38mlg==} @@ -18093,7 +18086,6 @@ packages: dependencies: dot-case: 3.0.4 tslib: 2.6.2 - dev: true /path-exists@3.0.0: resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==} @@ -18782,20 +18774,6 @@ packages: react: 17.0.2 react-final-form: 6.5.9(final-form@4.20.10)(react@17.0.2) - /react-final-form-listeners@1.0.3(final-form@4.20.10)(prop-types@15.8.1)(react-final-form@6.5.9)(react@17.0.2): - resolution: {integrity: sha512-OrdCNxSS4JQS/EXD+R530kZKFqaPfa+WcXPgVro/h4BpaBDF/Ja+BtHyCzDezCIb5rWaGGdOJIj+tN2YdtvrXg==} - peerDependencies: - final-form: '>=4.0.0' - prop-types: ^15.6.0 - react: ^15.3.0 || ^16.0.0 || ^17.0.0 - react-final-form: '>=3.0.0' - dependencies: - '@babel/runtime': 7.24.5 - final-form: 4.20.10 - prop-types: 15.8.1 - react: 17.0.2 - react-final-form: 6.5.9(final-form@4.20.10)(react@17.0.2) - /react-final-form@6.5.9(final-form@4.20.10)(react@17.0.2): resolution: {integrity: sha512-x3XYvozolECp3nIjly+4QqxdjSSWfcnpGEL5K8OBT6xmGrq5kBqbA6+/tOqoom9NwqIPPbxPNsOViFlbKgowbA==} peerDependencies: @@ -19538,7 +19516,6 @@ packages: no-case: 3.0.4 tslib: 2.6.2 upper-case-first: 2.0.2 - dev: true /serialize-javascript@6.0.2: resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==} @@ -19771,7 +19748,6 @@ packages: dependencies: dot-case: 3.0.4 tslib: 2.6.2 - dev: true /sockjs@0.3.24: resolution: {integrity: sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==} @@ -21007,7 +20983,6 @@ packages: resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==} dependencies: tslib: 2.6.2 - dev: true /upper-case@1.1.3: resolution: {integrity: sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==} @@ -21017,7 +20992,6 @@ packages: resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==} dependencies: tslib: 2.6.2 - dev: true /uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} From 84c3cd7492f2b41246490b8d2e6e120d1d071e73 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Sun, 1 Sep 2024 09:42:48 +0200 Subject: [PATCH 12/45] Admin: Remove axios --- demo/admin/package.json | 1 - packages/admin/package.json | 1 - pnpm-lock.yaml | 6 ------ 3 files changed, 8 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index e9fd564c..6fc1bbfc 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -41,7 +41,6 @@ "@mui/styles": "^5.8.6", "@mui/system": "^5.8.6", "@mui/x-data-grid": "^5.17.26", - "axios": "^0.21.0", "change-case": "^5.3.0", "date-fns": "^2.28.0", "draft-js": "^0.11.0", diff --git a/packages/admin/package.json b/packages/admin/package.json index 88b7d3ea..3ca311ad 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -57,7 +57,6 @@ "@types/react": "^17.0", "@types/react-dom": "^17.0.0", "@types/react-router": "^5.0.3", - "axios": "^0.21.0", "draft-js": "^0.11.0", "eslint": "^8.0.0", "final-form": "^4.16.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d80388d5..58280a90 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -101,9 +101,6 @@ importers: '@mui/x-data-grid': specifier: ^5.17.26 version: 5.17.26(@mui/material@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) - axios: - specifier: ^0.21.0 - version: 0.21.4 change-case: specifier: ^5.3.0 version: 5.4.2 @@ -874,9 +871,6 @@ importers: '@types/react-router': specifier: ^5.0.3 version: 5.1.20 - axios: - specifier: ^0.21.0 - version: 0.21.4 draft-js: specifier: ^0.11.0 version: 0.11.7(react-dom@17.0.2)(react@17.0.2) From 3dc4cd8ce66a02c84f6108c47d70af34a87e4deb Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Sun, 1 Sep 2024 09:44:00 +0200 Subject: [PATCH 13/45] Admin: Remove @mui/styles --- demo/admin/package.json | 1 - demo/admin/src/theme.ts | 6 --- packages/admin/package.json | 2 - pnpm-lock.yaml | 102 ------------------------------------ 4 files changed, 111 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 6fc1bbfc..af080d04 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -38,7 +38,6 @@ "@mui/icons-material": "^5.8.4", "@mui/lab": "^5.0.0-alpha.88", "@mui/material": "^5.8.6", - "@mui/styles": "^5.8.6", "@mui/system": "^5.8.6", "@mui/x-data-grid": "^5.17.26", "change-case": "^5.3.0", diff --git a/demo/admin/src/theme.ts b/demo/admin/src/theme.ts index 4c1dda24..320490e1 100644 --- a/demo/admin/src/theme.ts +++ b/demo/admin/src/theme.ts @@ -1,10 +1,4 @@ import { createCometTheme } from "@comet/admin-theme"; import type {} from "@mui/lab/themeAugmentation"; -import { Theme } from "@mui/material"; export const theme = createCometTheme(); - -declare module "@mui/styles/defaultTheme" { - // eslint-disable-next-line @typescript-eslint/no-empty-interface - export interface DefaultTheme extends Theme {} -} diff --git a/packages/admin/package.json b/packages/admin/package.json index 3ca311ad..22d3a76a 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -49,7 +49,6 @@ "@graphql-codegen/cli": "^2.0.0", "@mui/icons-material": "^5.8.4", "@mui/material": "^5.8.6", - "@mui/styles": "^5.8.6", "@mui/system": "^5.8.6", "@mui/x-data-grid": "^5.17.26", "@types/file-saver": "^2.0.7", @@ -85,7 +84,6 @@ "@emotion/styled": "^11.9.3", "@mui/icons-material": "^5.8.4", "@mui/material": "^5.8.6", - "@mui/styles": "^5.8.6", "@mui/system": "^5.8.6", "@mui/x-data-grid": "^5.17.26", "axios": "^0.21.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 58280a90..3a7111bd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -92,9 +92,6 @@ importers: '@mui/material': specifier: ^5.8.6 version: 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) - '@mui/styles': - specifier: ^5.8.6 - version: 5.15.5(@types/react@17.0.75)(react@17.0.2) '@mui/system': specifier: ^5.8.6 version: 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react@17.0.2) @@ -847,9 +844,6 @@ importers: '@mui/material': specifier: ^5.8.6 version: 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) - '@mui/styles': - specifier: ^5.8.6 - version: 5.15.5(@types/react@17.0.75)(react@17.0.2) '@mui/system': specifier: ^5.8.6 version: 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react@17.0.2) @@ -6525,36 +6519,6 @@ packages: prop-types: 15.8.1 react: 17.0.2 - /@mui/styles@5.15.5(@types/react@17.0.75)(react@17.0.2): - resolution: {integrity: sha512-oKhGfhIf5lYxWeT6LWodHCyV834cUnU/xUp2LAevwT6Jay2U0q1H8RVUzPBuSyp/U+7ZZnxZ+NQfyHqNpQAJqg==} - engines: {node: '>=12.0.0'} - peerDependencies: - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - dependencies: - '@babel/runtime': 7.23.8 - '@emotion/hash': 0.9.1 - '@mui/private-theming': 5.15.5(@types/react@17.0.75)(react@17.0.2) - '@mui/types': 7.2.13(@types/react@17.0.75) - '@mui/utils': 5.15.5(@types/react@17.0.75)(react@17.0.2) - '@types/react': 17.0.75 - clsx: 2.1.0 - csstype: 3.1.3 - hoist-non-react-statics: 3.3.2 - jss: 10.10.0 - jss-plugin-camel-case: 10.10.0 - jss-plugin-default-unit: 10.10.0 - jss-plugin-global: 10.10.0 - jss-plugin-nested: 10.10.0 - jss-plugin-props-sort: 10.10.0 - jss-plugin-rule-value-function: 10.10.0 - jss-plugin-vendor-prefixer: 10.10.0 - prop-types: 15.8.1 - react: 17.0.2 - /@mui/system@5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react@17.0.2): resolution: {integrity: sha512-DMv2vGjUKaDt/m0RlzvLjpKiS5V0LoBhiMUHf5pWdj6uoNlN4FuKUe4pFeYmQMIO5DnVZKybmpPepfkdfEH+Og==} engines: {node: '>=12.0.0'} @@ -11684,12 +11648,6 @@ packages: postcss-value-parser: 4.2.0 dev: false - /css-vendor@2.0.8: - resolution: {integrity: sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==} - dependencies: - '@babel/runtime': 7.24.5 - is-in-browser: 1.1.3 - /css-what@6.1.0: resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==} engines: {node: '>= 6'} @@ -14318,9 +14276,6 @@ packages: hasBin: true dev: true - /hyphenate-style-name@1.0.4: - resolution: {integrity: sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==} - /iconv-lite@0.4.24: resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} engines: {node: '>=0.10.0'} @@ -14647,9 +14602,6 @@ packages: dependencies: is-extglob: 2.1.1 - /is-in-browser@1.1.3: - resolution: {integrity: sha512-FeXIBgG/CPGd/WUxuEyvgGTEfwiG9Z4EKGxjNMRqviiIIfsmgrpnHLffEDdwUHqNva1VEW91o3xBT/m8Elgl9g==} - /is-inside-container@1.0.0: resolution: {integrity: sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==} engines: {node: '>=14.16'} @@ -16106,60 +16058,6 @@ packages: json-schema: 0.4.0 verror: 1.10.0 - /jss-plugin-camel-case@10.10.0: - resolution: {integrity: sha512-z+HETfj5IYgFxh1wJnUAU8jByI48ED+v0fuTuhKrPR+pRBYS2EDwbusU8aFOpCdYhtRc9zhN+PJ7iNE8pAWyPw==} - dependencies: - '@babel/runtime': 7.24.5 - hyphenate-style-name: 1.0.4 - jss: 10.10.0 - - /jss-plugin-default-unit@10.10.0: - resolution: {integrity: sha512-SvpajxIECi4JDUbGLefvNckmI+c2VWmP43qnEy/0eiwzRUsafg5DVSIWSzZe4d2vFX1u9nRDP46WCFV/PXVBGQ==} - dependencies: - '@babel/runtime': 7.24.5 - jss: 10.10.0 - - /jss-plugin-global@10.10.0: - resolution: {integrity: sha512-icXEYbMufiNuWfuazLeN+BNJO16Ge88OcXU5ZDC2vLqElmMybA31Wi7lZ3lf+vgufRocvPj8443irhYRgWxP+A==} - dependencies: - '@babel/runtime': 7.24.5 - jss: 10.10.0 - - /jss-plugin-nested@10.10.0: - resolution: {integrity: sha512-9R4JHxxGgiZhurDo3q7LdIiDEgtA1bTGzAbhSPyIOWb7ZubrjQe8acwhEQ6OEKydzpl8XHMtTnEwHXCARLYqYA==} - dependencies: - '@babel/runtime': 7.24.5 - jss: 10.10.0 - tiny-warning: 1.0.3 - - /jss-plugin-props-sort@10.10.0: - resolution: {integrity: sha512-5VNJvQJbnq/vRfje6uZLe/FyaOpzP/IH1LP+0fr88QamVrGJa0hpRRyAa0ea4U/3LcorJfBFVyC4yN2QC73lJg==} - dependencies: - '@babel/runtime': 7.24.5 - jss: 10.10.0 - - /jss-plugin-rule-value-function@10.10.0: - resolution: {integrity: sha512-uEFJFgaCtkXeIPgki8ICw3Y7VMkL9GEan6SqmT9tqpwM+/t+hxfMUdU4wQ0MtOiMNWhwnckBV0IebrKcZM9C0g==} - dependencies: - '@babel/runtime': 7.24.5 - jss: 10.10.0 - tiny-warning: 1.0.3 - - /jss-plugin-vendor-prefixer@10.10.0: - resolution: {integrity: sha512-UY/41WumgjW8r1qMCO8l1ARg7NHnfRVWRhZ2E2m0DMYsr2DD91qIXLyNhiX83hHswR7Wm4D+oDYNC1zWCJWtqg==} - dependencies: - '@babel/runtime': 7.24.5 - css-vendor: 2.0.8 - jss: 10.10.0 - - /jss@10.10.0: - resolution: {integrity: sha512-cqsOTS7jqPsPMjtKYDUpdFC0AbhYFLTcuGRqymgmdJIeQ8cH7+AgX7YSgQy79wXloZq2VvATYxUOUQEvS1V/Zw==} - dependencies: - '@babel/runtime': 7.24.5 - csstype: 3.1.3 - is-in-browser: 1.1.3 - tiny-warning: 1.0.3 - /jsx-ast-utils@3.3.5: resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==} engines: {node: '>=4.0'} From 4663a859038db02a642dd5e9f7150fa85f6b9add Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Sun, 1 Sep 2024 09:45:51 +0200 Subject: [PATCH 14/45] Admin: Rearrange components in App.tsx --- demo/admin/src/App.tsx | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/demo/admin/src/App.tsx b/demo/admin/src/App.tsx index 94bca084..20cdda99 100644 --- a/demo/admin/src/App.tsx +++ b/demo/admin/src/App.tsx @@ -59,23 +59,24 @@ const pageTreeDocumentTypes = { export function App() { return ( - - - { - const siteConfig = configs[scope.domain]; - return { - ...siteConfig, - previewUrl: `${siteConfig.previewUrl}/${scope.language}`, - }; - }, - }} - > - - scope.domain}> - + + { + const siteConfig = configs[scope.domain]; + return { + ...siteConfig, + previewUrl: `${siteConfig.previewUrl}/${scope.language}`, + }; + }, + }} + > + + scope.domain}> + + + - - - - - - - + + + + + + ); } From ea3004488b504f33e57af4816146736fd9cdeed2 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Sun, 1 Sep 2024 09:46:40 +0200 Subject: [PATCH 15/45] Admin: Rename previewUrl prop of SiteConfig --- demo/admin/src/App.tsx | 2 +- demo/admin/src/documents/pages/EditPage.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/admin/src/App.tsx b/demo/admin/src/App.tsx index 20cdda99..c69ac219 100644 --- a/demo/admin/src/App.tsx +++ b/demo/admin/src/App.tsx @@ -67,7 +67,7 @@ export function App() { const siteConfig = configs[scope.domain]; return { ...siteConfig, - previewUrl: `${siteConfig.previewUrl}/${scope.language}`, + previewUrl: `${siteConfig.blockPreviewBaseUrl}/${scope.language}`, }; }, }} diff --git a/demo/admin/src/documents/pages/EditPage.tsx b/demo/admin/src/documents/pages/EditPage.tsx index 690ec832..cd147587 100644 --- a/demo/admin/src/documents/pages/EditPage.tsx +++ b/demo/admin/src/documents/pages/EditPage.tsx @@ -142,7 +142,7 @@ export const EditPage: React.FC = ({ id, category }) => { - + {[ { key: "content", From bbba4c2b850a06952c0011cead5b32d6b1cd7b23 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Sun, 1 Sep 2024 09:51:36 +0200 Subject: [PATCH 16/45] Admin: Adjust content scope config for new Content Scope Picker --- .../admin/src/common/ContentScopeProvider.tsx | 41 ++++--------------- 1 file changed, 8 insertions(+), 33 deletions(-) diff --git a/demo/admin/src/common/ContentScopeProvider.tsx b/demo/admin/src/common/ContentScopeProvider.tsx index cd4659a9..9f6c6af8 100644 --- a/demo/admin/src/common/ContentScopeProvider.tsx +++ b/demo/admin/src/common/ContentScopeProvider.tsx @@ -1,8 +1,5 @@ -import { Domain as DomainIcon, Language as LanguageIcon } from "@comet/admin-icons"; import { ContentScopeConfigProps, - ContentScopeControls as ContentScopeControlsLibrary, - ContentScopeControlsConfig, ContentScopeProvider as ContentScopeProviderLibrary, ContentScopeProviderProps, ContentScopeValues, @@ -10,9 +7,7 @@ import { UseContentScopeApi, useContentScopeConfig as useContentScopeConfigLibrary, useCurrentUser, - useSitesConfig, } from "@comet/cms-admin"; -import { SitesConfig } from "@src/config"; import React from "react"; type Domain = "main" | "secondary" | string; @@ -27,42 +22,22 @@ export function useContentScope(): UseContentScopeApi { return useContentScopeLibrary(); } -const controlsConfig: ContentScopeControlsConfig = { - domain: { - label: "Domain", - icon: DomainIcon, - }, - language: { - label: "Language", - icon: LanguageIcon, - }, -}; - -// convenince wrapper for app (Bind config and Generic) -export const ContentScopeControls: React.FC = () => { - return config={controlsConfig} />; -}; - export function useContentScopeConfig(p: ContentScopeConfigProps): void { return useContentScopeConfigLibrary(p); } export const ContentScopeProvider: React.FC> = ({ children }) => { - const sitesConfig = useSitesConfig(); const user = useCurrentUser(); - const allowedUserDomains = user.allowedContentScopes.map((contentScope) => contentScope.domain); + // TODO in COMET: filter already in API, avoid type cast, support labels + const userContentScopes = user.allowedContentScopes.filter( + (value, index, self) => self.map((x) => JSON.stringify(x)).indexOf(JSON.stringify(value)) == index, + ) as ContentScope[]; - const allowedSiteConfigs = Object.fromEntries( - Object.entries(sitesConfig.configs).filter(([siteKey, siteConfig]) => (allowedUserDomains ? allowedUserDomains.includes(siteKey) : true)), - ); - const values: ContentScopeValues = { - domain: Object.keys(allowedSiteConfigs).map((key) => ({ value: key })), - language: [ - { label: "English", value: "en" }, - { label: "German", value: "de" }, - ], - }; + const values: ContentScopeValues = userContentScopes.map((contentScope) => ({ + domain: { value: contentScope.domain }, + language: { value: contentScope.language, label: contentScope.language.toUpperCase() }, + })); return ( values={values} defaultValue={{ domain: "main", language: "en" }}> From 20a8286a7e9ccf30590ff46c1c6a906ad7bcfa35 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Mon, 2 Sep 2024 09:27:01 +0200 Subject: [PATCH 17/45] Admin: Remove EditPageLayout --- demo/admin/src/documents/links/EditLink.tsx | 6 +++--- demo/admin/src/documents/pages/EditPage.tsx | 5 ++--- packages/admin/src/brevoContacts/form/BrevoContactForm.tsx | 6 +++--- .../admin/src/emailCampaigns/form/EmailCampaignForm.tsx | 5 ++--- .../admin/src/emailCampaigns/view/EmailCampaignView.tsx | 6 +++--- packages/admin/src/targetGroups/TargetGroupForm.tsx | 6 +++--- 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/demo/admin/src/documents/links/EditLink.tsx b/demo/admin/src/documents/links/EditLink.tsx index ef1f4fd4..ab9979d4 100644 --- a/demo/admin/src/documents/links/EditLink.tsx +++ b/demo/admin/src/documents/links/EditLink.tsx @@ -2,7 +2,7 @@ import { gql } from "@apollo/client"; import { Loading, MainContent, RouterPrompt, RouterTab, RouterTabs, Toolbar, ToolbarFillSpace, ToolbarItem, useStackApi } from "@comet/admin"; import { ArrowLeft } from "@comet/admin-icons"; import { AdminComponentRoot } from "@comet/blocks-admin"; -import { createUsePage, EditPageLayout, PageName } from "@comet/cms-admin"; +import { createUsePage, PageName } from "@comet/cms-admin"; import { IconButton } from "@mui/material"; import { LinkBlock } from "@src/common/blocks/LinkBlock"; import * as React from "react"; @@ -74,7 +74,7 @@ export const EditLink: React.FC = ({ id }) => { if (!linkState) return <>; return ( - + <> {hasChanges && ( { @@ -111,6 +111,6 @@ export const EditLink: React.FC = ({ id }) => { {dialogs} - + ); }; diff --git a/demo/admin/src/documents/pages/EditPage.tsx b/demo/admin/src/documents/pages/EditPage.tsx index cd147587..68973fd0 100644 --- a/demo/admin/src/documents/pages/EditPage.tsx +++ b/demo/admin/src/documents/pages/EditPage.tsx @@ -5,7 +5,6 @@ import { AdminComponentRoot, AdminTabLabel } from "@comet/blocks-admin"; import { BlockPreviewWithTabs, createUsePage, - EditPageLayout, openSitePreviewWindow, PageName, useBlockPreview, @@ -97,7 +96,7 @@ export const EditPage: React.FC = ({ id, category }) => { } return ( - + <> {hasChanges && ( { @@ -172,6 +171,6 @@ export const EditPage: React.FC = ({ id, category }) => { {dialogs} - + ); }; diff --git a/packages/admin/src/brevoContacts/form/BrevoContactForm.tsx b/packages/admin/src/brevoContacts/form/BrevoContactForm.tsx index 1559f24b..9862428e 100644 --- a/packages/admin/src/brevoContacts/form/BrevoContactForm.tsx +++ b/packages/admin/src/brevoContacts/form/BrevoContactForm.tsx @@ -17,7 +17,7 @@ import { useStackApi, } from "@comet/admin"; import { ArrowLeft } from "@comet/admin-icons"; -import { ContentScopeInterface, EditPageLayout, resolveHasSaveConflict, useFormSaveConflict } from "@comet/cms-admin"; +import { ContentScopeInterface, resolveHasSaveConflict, useFormSaveConflict } from "@comet/cms-admin"; import { Card, IconButton } from "@mui/material"; import { Box } from "@mui/system"; import { FormApi } from "final-form"; @@ -161,7 +161,7 @@ export function BrevoContactForm({ id, scope, input2State, additionalFormFields, return ( apiRef={formApiRef} onSubmit={handleSubmit} mode={mode} initialValues={initialValues}> {({ values }) => ( - + <> {saveConflict.dialogs} @@ -221,7 +221,7 @@ export function BrevoContactForm({ id, scope, input2State, additionalFormFields, )} - + )} ); diff --git a/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx b/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx index 72a219ae..11e2814e 100644 --- a/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx +++ b/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx @@ -25,7 +25,6 @@ import { import { BlockPreviewWithTabs, ContentScopeInterface, - EditPageLayout, queryUpdatedAt, resolveHasSaveConflict, useBlockPreview, @@ -222,7 +221,7 @@ export function EmailCampaignForm({ id, EmailCampaignContentBlock, scope }: Form const isSchedulingDisabled = state.sendingState === "SENT" || mode === "add" || state.targetGroups.length === 0 || isScheduledDateInPast; return ( - + <> {saveConflict.dialogs} @@ -306,6 +305,6 @@ export function EmailCampaignForm({ id, EmailCampaignContentBlock, scope }: Form ]} - + ); } diff --git a/packages/admin/src/emailCampaigns/view/EmailCampaignView.tsx b/packages/admin/src/emailCampaigns/view/EmailCampaignView.tsx index a9e006a9..26062f0c 100644 --- a/packages/admin/src/emailCampaigns/view/EmailCampaignView.tsx +++ b/packages/admin/src/emailCampaigns/view/EmailCampaignView.tsx @@ -2,7 +2,7 @@ import { useQuery } from "@apollo/client"; import { Loading, MainContent, Toolbar, ToolbarFillSpace, ToolbarItem, ToolbarTitleItem, useStackApi } from "@comet/admin"; import { ArrowLeft } from "@comet/admin-icons"; import { BlockInterface, IFrameBridgeProvider } from "@comet/blocks-admin"; -import { BlockPreview, EditPageLayout, useBlockPreview, useCmsBlockContext, useContentScope } from "@comet/cms-admin"; +import { BlockPreview, useBlockPreview, useCmsBlockContext, useContentScope } from "@comet/cms-admin"; import { IconButton } from "@mui/material"; import React from "react"; import { FormattedMessage } from "react-intl"; @@ -52,7 +52,7 @@ export function EmailCampaignView({ id, EmailCampaignContentBlock }: EmailCampai }; return ( - + <> @@ -69,6 +69,6 @@ export function EmailCampaignView({ id, EmailCampaignContentBlock }: EmailCampai - + ); } diff --git a/packages/admin/src/targetGroups/TargetGroupForm.tsx b/packages/admin/src/targetGroups/TargetGroupForm.tsx index 3b0163cf..84c389fb 100644 --- a/packages/admin/src/targetGroups/TargetGroupForm.tsx +++ b/packages/admin/src/targetGroups/TargetGroupForm.tsx @@ -17,7 +17,7 @@ import { useStackApi, } from "@comet/admin"; import { ArrowLeft } from "@comet/admin-icons"; -import { ContentScopeInterface, EditPageLayout, queryUpdatedAt, resolveHasSaveConflict, useFormSaveConflict } from "@comet/cms-admin"; +import { ContentScopeInterface, queryUpdatedAt, resolveHasSaveConflict, useFormSaveConflict } from "@comet/cms-admin"; import { IconButton } from "@mui/material"; import { FormApi } from "final-form"; import React from "react"; @@ -118,7 +118,7 @@ export function TargetGroupForm({ id, scope, additionalFormFields, input2State, return ( apiRef={formApiRef} onSubmit={handleSubmit} mode={mode} initialValues={initialValues}> {({ values }) => ( - + <> {saveConflict.dialogs} @@ -182,7 +182,7 @@ export function TargetGroupForm({ id, scope, additionalFormFields, input2State, - + )} ); From 424831dfb600feeb1f193d1d4654f020a0e798d4 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Mon, 2 Sep 2024 09:27:17 +0200 Subject: [PATCH 18/45] API: Update schema --- demo/api/block-meta.json | 167 +++++++++++++++++++++++++++++++-------- demo/api/schema.gql | 55 ++++++------- 2 files changed, 159 insertions(+), 63 deletions(-) diff --git a/demo/api/block-meta.json b/demo/api/block-meta.json index 40aa326b..3b29b12a 100644 --- a/demo/api/block-meta.json +++ b/demo/api/block-meta.json @@ -16,6 +16,60 @@ } ] }, + { + "name": "DamFileDownloadLink", + "fields": [ + { + "name": "file", + "kind": "NestedObject", + "object": { + "fields": [ + { + "name": "id", + "kind": "String", + "nullable": false + }, + { + "name": "name", + "kind": "String", + "nullable": false + }, + { + "name": "fileUrl", + "kind": "String", + "nullable": false + } + ] + }, + "nullable": true + }, + { + "name": "openFileType", + "kind": "Enum", + "enum": [ + "NewTab", + "Download" + ], + "nullable": false + } + ], + "inputFields": [ + { + "name": "fileId", + "kind": "String", + "nullable": true + }, + { + "name": "openFileType", + "kind": "Enum", + "enum": [ + "NewTab", + "Download" + ], + "nullable": false + } + ] + }, { "name": "DamImage", "fields": [ @@ -88,15 +142,21 @@ "nullable": true }, { - "name": "loop", + "name": "showControls", "kind": "Boolean", "nullable": true }, { - "name": "showControls", + "name": "loop", "kind": "Boolean", "nullable": true }, + { + "name": "previewImage", + "kind": "Block", + "block": "PixelImage", + "nullable": false + }, { "name": "damFile", "kind": "NestedObject", @@ -159,12 +219,12 @@ ], "inputFields": [ { - "name": "damFileId", - "kind": "String", + "name": "autoplay", + "kind": "Boolean", "nullable": true }, { - "name": "autoplay", + "name": "showControls", "kind": "Boolean", "nullable": true }, @@ -174,8 +234,14 @@ "nullable": true }, { - "name": "showControls", - "kind": "Boolean", + "name": "previewImage", + "kind": "Block", + "block": "PixelImage", + "nullable": false + }, + { + "name": "damFileId", + "kind": "String", "nullable": true } ] @@ -328,6 +394,23 @@ "fields": [], "inputFields": [] }, + { + "name": "EmailLink", + "fields": [ + { + "name": "email", + "kind": "String", + "nullable": true + } + ], + "inputFields": [ + { + "name": "email", + "kind": "String", + "nullable": true + } + ] + }, { "name": "ExternalLink", "fields": [ @@ -422,6 +505,11 @@ "kind": "String", "nullable": false }, + { + "name": "scope", + "kind": "Json", + "nullable": true + }, { "name": "documentType", "kind": "String", @@ -679,6 +767,23 @@ } ] }, + { + "name": "PhoneLink", + "fields": [ + { + "name": "phone", + "kind": "String", + "nullable": true + } + ], + "inputFields": [ + { + "name": "phone", + "kind": "String", + "nullable": true + } + ] + }, { "name": "PixelImage", "fields": [ @@ -1372,20 +1477,6 @@ { "name": "YouTubeVideo", "fields": [ - { - "name": "youtubeIdentifier", - "kind": "String", - "nullable": false - }, - { - "name": "aspectRatio", - "kind": "Enum", - "enum": [ - "16X9", - "4X3" - ], - "nullable": false - }, { "name": "autoplay", "kind": "Boolean", @@ -1400,23 +1491,20 @@ "name": "loop", "kind": "Boolean", "nullable": true - } - ], - "inputFields": [ - { - "name": "youtubeIdentifier", - "kind": "String", - "nullable": false }, { - "name": "aspectRatio", - "kind": "Enum", - "enum": [ - "16X9", - "4X3" - ], + "name": "previewImage", + "kind": "Block", + "block": "PixelImage", "nullable": false }, + { + "name": "youtubeIdentifier", + "kind": "String", + "nullable": true + } + ], + "inputFields": [ { "name": "autoplay", "kind": "Boolean", @@ -1431,6 +1519,17 @@ "name": "loop", "kind": "Boolean", "nullable": true + }, + { + "name": "previewImage", + "kind": "Block", + "block": "PixelImage", + "nullable": false + }, + { + "name": "youtubeIdentifier", + "kind": "String", + "nullable": true } ] } diff --git a/demo/api/schema.gql b/demo/api/schema.gql index 143e5c3d..115f5783 100644 --- a/demo/api/schema.gql +++ b/demo/api/schema.gql @@ -16,8 +16,8 @@ type CurrentUser { id: String! name: String! email: String! - language: String! permissions: [CurrentUserPermission!]! + permissionsForScope(scope: JSONObject!): [String!]! } type UserPermission { @@ -43,23 +43,6 @@ 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 @@ -107,6 +90,23 @@ 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! @@ -155,7 +155,6 @@ type User { id: String! name: String! email: String! - language: String! } type PaginatedUserList { @@ -530,7 +529,6 @@ input UserFilter { name: StringFilter email: StringFilter status: StringFilter - language: StringFilter and: [UserFilter!] or: [UserFilter!] } @@ -552,7 +550,6 @@ enum UserSortField { name email status - language } enum SortDirection { @@ -584,8 +581,8 @@ input RedirectFilter { generationType: StringFilter source: StringFilter active: BooleanFilter - createdAt: DateFilter - updatedAt: DateFilter + createdAt: DateTimeFilter + updatedAt: DateTimeFilter and: [RedirectFilter!] or: [RedirectFilter!] } @@ -594,7 +591,7 @@ input BooleanFilter { equal: Boolean } -input DateFilter { +input DateTimeFilter { equal: DateTime lowerThan: DateTime greaterThan: DateTime @@ -651,11 +648,11 @@ input FolderFilterInput { } input EmailCampaignFilter { - createdAt: DateFilter - updatedAt: DateFilter + createdAt: DateTimeFilter + updatedAt: DateTimeFilter title: StringFilter subject: StringFilter - scheduledAt: DateFilter + scheduledAt: DateTimeFilter and: [EmailCampaignFilter!] or: [EmailCampaignFilter!] } @@ -674,8 +671,8 @@ enum EmailCampaignSortField { } input TargetGroupFilter { - createdAt: DateFilter - updatedAt: DateFilter + createdAt: DateTimeFilter + updatedAt: DateTimeFilter title: StringFilter and: [TargetGroupFilter!] or: [TargetGroupFilter!] From 5caef44d332bd4395232532663948a84f29992b2 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Mon, 2 Sep 2024 09:30:35 +0200 Subject: [PATCH 19/45] Admin: Replace FinalFormSaveSplitButton with FinalFormSaveButton --- packages/admin/src/brevoContacts/form/BrevoContactForm.tsx | 4 ++-- packages/admin/src/targetGroups/TargetGroupForm.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/admin/src/brevoContacts/form/BrevoContactForm.tsx b/packages/admin/src/brevoContacts/form/BrevoContactForm.tsx index 9862428e..2978d295 100644 --- a/packages/admin/src/brevoContacts/form/BrevoContactForm.tsx +++ b/packages/admin/src/brevoContacts/form/BrevoContactForm.tsx @@ -2,7 +2,7 @@ import { DocumentNode, gql, useApolloClient, useQuery } from "@apollo/client"; import { Alert, FinalForm, - FinalFormSaveSplitButton, + FinalFormSaveButton, FinalFormSubmitEvent, FormSection, Loading, @@ -174,7 +174,7 @@ export function BrevoContactForm({ id, scope, input2State, additionalFormFields, - + diff --git a/packages/admin/src/targetGroups/TargetGroupForm.tsx b/packages/admin/src/targetGroups/TargetGroupForm.tsx index 84c389fb..44dbb592 100644 --- a/packages/admin/src/targetGroups/TargetGroupForm.tsx +++ b/packages/admin/src/targetGroups/TargetGroupForm.tsx @@ -4,7 +4,7 @@ import { FieldSet, FinalForm, FinalFormInput, - FinalFormSaveSplitButton, + FinalFormSaveButton, FinalFormSubmitEvent, Loading, MainContent, @@ -131,7 +131,7 @@ export function TargetGroupForm({ id, scope, additionalFormFields, input2State, - + From c0ba898c0c87efbf5f710b4f59ff24201b965830 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Mon, 2 Sep 2024 09:41:30 +0200 Subject: [PATCH 20/45] Admin: Configure all Toolbars correctly --- demo/admin/src/documents/links/EditLink.tsx | 4 ++-- demo/admin/src/documents/pages/EditPage.tsx | 3 ++- packages/admin/src/brevoContacts/BrevoContactsGrid.tsx | 6 +++--- packages/admin/src/brevoContacts/BrevoContactsPage.tsx | 5 +++-- .../admin/src/brevoContacts/form/BrevoContactForm.tsx | 4 ++-- .../admin/src/emailCampaigns/EmailCampaignsGrid.tsx | 6 +++--- .../admin/src/emailCampaigns/EmailCampaignsPage.tsx | 5 +++-- .../src/emailCampaigns/form/EmailCampaignForm.tsx | 3 ++- .../statistics/EmailCampaignStatistics.tsx | 4 ++-- .../src/emailCampaigns/view/EmailCampaignView.tsx | 4 ++-- packages/admin/src/targetGroups/TargetGroupForm.tsx | 4 ++-- packages/admin/src/targetGroups/TargetGroupsGrid.tsx | 6 +++--- packages/admin/src/targetGroups/TargetGroupsPage.tsx | 5 +++-- .../targetGroups/addContacts/AddContactsGridSelect.tsx | 10 +++++----- .../allAssignedContacts/AllAssignedContactsGrid.tsx | 6 +++--- 15 files changed, 40 insertions(+), 35 deletions(-) diff --git a/demo/admin/src/documents/links/EditLink.tsx b/demo/admin/src/documents/links/EditLink.tsx index ab9979d4..a1d62678 100644 --- a/demo/admin/src/documents/links/EditLink.tsx +++ b/demo/admin/src/documents/links/EditLink.tsx @@ -2,7 +2,7 @@ import { gql } from "@apollo/client"; import { Loading, MainContent, RouterPrompt, RouterTab, RouterTabs, Toolbar, ToolbarFillSpace, ToolbarItem, useStackApi } from "@comet/admin"; import { ArrowLeft } from "@comet/admin-icons"; import { AdminComponentRoot } from "@comet/blocks-admin"; -import { createUsePage, PageName } from "@comet/cms-admin"; +import { ContentScopeIndicator, createUsePage, PageName } from "@comet/cms-admin"; import { IconButton } from "@mui/material"; import { LinkBlock } from "@src/common/blocks/LinkBlock"; import * as React from "react"; @@ -93,7 +93,7 @@ export const EditLink: React.FC = ({ id }) => { }} /> )} - + }> diff --git a/demo/admin/src/documents/pages/EditPage.tsx b/demo/admin/src/documents/pages/EditPage.tsx index 68973fd0..7cd0243d 100644 --- a/demo/admin/src/documents/pages/EditPage.tsx +++ b/demo/admin/src/documents/pages/EditPage.tsx @@ -4,6 +4,7 @@ import { ArrowLeft, Preview } from "@comet/admin-icons"; import { AdminComponentRoot, AdminTabLabel } from "@comet/blocks-admin"; import { BlockPreviewWithTabs, + ContentScopeIndicator, createUsePage, openSitePreviewWindow, PageName, @@ -116,7 +117,7 @@ export const EditPage: React.FC = ({ id, category }) => { }} /> )} - + }> diff --git a/packages/admin/src/brevoContacts/BrevoContactsGrid.tsx b/packages/admin/src/brevoContacts/BrevoContactsGrid.tsx index 3c2a62b8..b0e2cfaf 100644 --- a/packages/admin/src/brevoContacts/BrevoContactsGrid.tsx +++ b/packages/admin/src/brevoContacts/BrevoContactsGrid.tsx @@ -1,11 +1,11 @@ import { DocumentNode, gql, useApolloClient, useQuery } from "@apollo/client"; import { + DataGridToolbar, MainContent, messages, RowActionsItem, RowActionsMenu, StackLink, - Toolbar, ToolbarActions, ToolbarFillSpace, ToolbarItem, @@ -68,7 +68,7 @@ function BrevoContactsGridToolbar({ intl, scope }: { intl: IntlShape; scope: GQL return ( <> - + @@ -84,7 +84,7 @@ function BrevoContactsGridToolbar({ intl, scope }: { intl: IntlShape; scope: GQL - + {contactImportComponent} ); diff --git a/packages/admin/src/brevoContacts/BrevoContactsPage.tsx b/packages/admin/src/brevoContacts/BrevoContactsPage.tsx index 53aca95b..09f69d7d 100644 --- a/packages/admin/src/brevoContacts/BrevoContactsPage.tsx +++ b/packages/admin/src/brevoContacts/BrevoContactsPage.tsx @@ -1,5 +1,5 @@ -import { Stack, StackPage, StackSwitch } from "@comet/admin"; -import { useContentScope } from "@comet/cms-admin"; +import { Stack, StackPage, StackSwitch, StackToolbar } from "@comet/admin"; +import { ContentScopeIndicator, useContentScope } from "@comet/cms-admin"; import { GridColDef } from "@mui/x-data-grid"; import { DocumentNode } from "graphql"; import * as React from "react"; @@ -36,6 +36,7 @@ function createBrevoContactsPage({ + } /> ( <> {saveConflict.dialogs} - + }> diff --git a/packages/admin/src/emailCampaigns/EmailCampaignsGrid.tsx b/packages/admin/src/emailCampaigns/EmailCampaignsGrid.tsx index 2fa765da..80b359f1 100644 --- a/packages/admin/src/emailCampaigns/EmailCampaignsGrid.tsx +++ b/packages/admin/src/emailCampaigns/EmailCampaignsGrid.tsx @@ -1,12 +1,12 @@ import { gql, useApolloClient, useQuery } from "@apollo/client"; import { CrudContextMenu, + DataGridToolbar, GridFilterButton, MainContent, muiGridFilterToGql, muiGridSortToGql, StackLink, - Toolbar, ToolbarActions, ToolbarAutomaticTitleItem, ToolbarFillSpace, @@ -88,7 +88,7 @@ const createEmailCampaignMutation = gql` function EmailCampaignsGridToolbar() { return ( - + @@ -102,7 +102,7 @@ function EmailCampaignsGridToolbar() { - + ); } diff --git a/packages/admin/src/emailCampaigns/EmailCampaignsPage.tsx b/packages/admin/src/emailCampaigns/EmailCampaignsPage.tsx index d4cad598..13b08af5 100644 --- a/packages/admin/src/emailCampaigns/EmailCampaignsPage.tsx +++ b/packages/admin/src/emailCampaigns/EmailCampaignsPage.tsx @@ -1,6 +1,6 @@ -import { Stack, StackPage, StackSwitch } from "@comet/admin"; +import { Stack, StackPage, StackSwitch, StackToolbar } from "@comet/admin"; import { BlockInterface } from "@comet/blocks-admin"; -import { useContentScope } from "@comet/cms-admin"; +import { ContentScopeIndicator, useContentScope } from "@comet/cms-admin"; import * as React from "react"; import { useIntl } from "react-intl"; @@ -28,6 +28,7 @@ export function createEmailCampaignsPage({ scopeParts, EmailCampaignContentBlock + } /> {(selectedId) => } diff --git a/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx b/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx index 11e2814e..f2d295a5 100644 --- a/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx +++ b/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx @@ -24,6 +24,7 @@ import { } from "@comet/blocks-admin"; import { BlockPreviewWithTabs, + ContentScopeIndicator, ContentScopeInterface, queryUpdatedAt, resolveHasSaveConflict, @@ -223,7 +224,7 @@ export function EmailCampaignForm({ id, EmailCampaignContentBlock, scope }: Form return ( <> {saveConflict.dialogs} - + }> diff --git a/packages/admin/src/emailCampaigns/statistics/EmailCampaignStatistics.tsx b/packages/admin/src/emailCampaigns/statistics/EmailCampaignStatistics.tsx index 90a3799c..72873981 100644 --- a/packages/admin/src/emailCampaigns/statistics/EmailCampaignStatistics.tsx +++ b/packages/admin/src/emailCampaigns/statistics/EmailCampaignStatistics.tsx @@ -1,7 +1,7 @@ import { useQuery } from "@apollo/client"; import { MainContent, StackLink, Toolbar, ToolbarActions, ToolbarBackButton, ToolbarFillSpace } from "@comet/admin"; import { Add as AddIcon } from "@comet/admin-icons"; -import { useContentScopeConfig } from "@comet/cms-admin"; +import { ContentScopeIndicator, useContentScopeConfig } from "@comet/cms-admin"; import { Button, Grid } from "@mui/material"; import React from "react"; import { FormattedMessage } from "react-intl"; @@ -27,7 +27,7 @@ export const EmailCampaignStatistics = ({ id }: Props): React.ReactElement => { return ( <> - + }> diff --git a/packages/admin/src/emailCampaigns/view/EmailCampaignView.tsx b/packages/admin/src/emailCampaigns/view/EmailCampaignView.tsx index 26062f0c..b472114f 100644 --- a/packages/admin/src/emailCampaigns/view/EmailCampaignView.tsx +++ b/packages/admin/src/emailCampaigns/view/EmailCampaignView.tsx @@ -2,7 +2,7 @@ import { useQuery } from "@apollo/client"; import { Loading, MainContent, Toolbar, ToolbarFillSpace, ToolbarItem, ToolbarTitleItem, useStackApi } from "@comet/admin"; import { ArrowLeft } from "@comet/admin-icons"; import { BlockInterface, IFrameBridgeProvider } from "@comet/blocks-admin"; -import { BlockPreview, useBlockPreview, useCmsBlockContext, useContentScope } from "@comet/cms-admin"; +import { BlockPreview, ContentScopeIndicator, useBlockPreview, useCmsBlockContext, useContentScope } from "@comet/cms-admin"; import { IconButton } from "@mui/material"; import React from "react"; import { FormattedMessage } from "react-intl"; @@ -53,7 +53,7 @@ export function EmailCampaignView({ id, EmailCampaignContentBlock }: EmailCampai return ( <> - + }> diff --git a/packages/admin/src/targetGroups/TargetGroupForm.tsx b/packages/admin/src/targetGroups/TargetGroupForm.tsx index 44dbb592..c6ccc844 100644 --- a/packages/admin/src/targetGroups/TargetGroupForm.tsx +++ b/packages/admin/src/targetGroups/TargetGroupForm.tsx @@ -17,7 +17,7 @@ import { useStackApi, } from "@comet/admin"; import { ArrowLeft } from "@comet/admin-icons"; -import { ContentScopeInterface, queryUpdatedAt, resolveHasSaveConflict, useFormSaveConflict } from "@comet/cms-admin"; +import { ContentScopeIndicator, ContentScopeInterface, queryUpdatedAt, resolveHasSaveConflict, useFormSaveConflict } from "@comet/cms-admin"; import { IconButton } from "@mui/material"; import { FormApi } from "final-form"; import React from "react"; @@ -120,7 +120,7 @@ export function TargetGroupForm({ id, scope, additionalFormFields, input2State, {({ values }) => ( <> {saveConflict.dialogs} - + }> diff --git a/packages/admin/src/targetGroups/TargetGroupsGrid.tsx b/packages/admin/src/targetGroups/TargetGroupsGrid.tsx index dfc85158..049c92e2 100644 --- a/packages/admin/src/targetGroups/TargetGroupsGrid.tsx +++ b/packages/admin/src/targetGroups/TargetGroupsGrid.tsx @@ -1,12 +1,12 @@ import { gql, useApolloClient, useQuery } from "@apollo/client"; import { CrudContextMenu, + DataGridToolbar, GridFilterButton, MainContent, muiGridFilterToGql, muiGridSortToGql, StackLink, - Toolbar, ToolbarActions, ToolbarAutomaticTitleItem, ToolbarFillSpace, @@ -112,7 +112,7 @@ export function TargetGroupsGrid({ function TargetGroupsGridToolbar() { return ( - + @@ -133,7 +133,7 @@ export function TargetGroupsGrid({ - + ); } diff --git a/packages/admin/src/targetGroups/TargetGroupsPage.tsx b/packages/admin/src/targetGroups/TargetGroupsPage.tsx index d8886d19..9fa9be8c 100644 --- a/packages/admin/src/targetGroups/TargetGroupsPage.tsx +++ b/packages/admin/src/targetGroups/TargetGroupsPage.tsx @@ -1,5 +1,5 @@ -import { Stack, StackPage, StackSwitch } from "@comet/admin"; -import { useContentScope } from "@comet/cms-admin"; +import { Stack, StackPage, StackSwitch, Toolbar } from "@comet/admin"; +import { ContentScopeIndicator, useContentScope } from "@comet/cms-admin"; import { DocumentNode } from "graphql"; import * as React from "react"; import { useIntl } from "react-intl"; @@ -39,6 +39,7 @@ export function createTargetGroupsPage({ + } /> - + @@ -82,7 +82,7 @@ const AssignedContactsGridToolbar = ({ - + {component} ); @@ -92,7 +92,7 @@ const AssignableContactsGridToolbar = () => { const intl = useIntl(); return ( - + @@ -104,7 +104,7 @@ const AssignableContactsGridToolbar = () => { })} /> - + ); }; diff --git a/packages/admin/src/targetGroups/allAssignedContacts/AllAssignedContactsGrid.tsx b/packages/admin/src/targetGroups/allAssignedContacts/AllAssignedContactsGrid.tsx index 6c454bee..b64ac4ee 100644 --- a/packages/admin/src/targetGroups/allAssignedContacts/AllAssignedContactsGrid.tsx +++ b/packages/admin/src/targetGroups/allAssignedContacts/AllAssignedContactsGrid.tsx @@ -1,5 +1,5 @@ import { useQuery } from "@apollo/client"; -import { Toolbar, ToolbarItem, ToolbarTitleItem, useBufferedRowCount, useDataGridRemote, usePersistentColumnState } from "@comet/admin"; +import { DataGridToolbar, ToolbarItem, ToolbarTitleItem, useBufferedRowCount, useDataGridRemote, usePersistentColumnState } from "@comet/admin"; import { ContentScopeInterface } from "@comet/cms-admin"; import { DataGrid, GridColDef, GridToolbarQuickFilter } from "@mui/x-data-grid"; import * as React from "react"; @@ -16,7 +16,7 @@ const AssignedContactsGridToolbar = () => { const intl = useIntl(); return ( - + @@ -28,7 +28,7 @@ const AssignedContactsGridToolbar = () => { })} /> - + ); }; From f7ed09624e95ca4656777f8b893afa9a997d43a7 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Mon, 2 Sep 2024 09:48:26 +0200 Subject: [PATCH 21/45] Admin: Import GridColDef from @comet/admin instead of @mui/x-data-grid --- .../brevoContactsPageAttributesConfig.tsx | 3 +-- .../admin/src/brevoContacts/BrevoContactsGrid.tsx | 3 ++- .../admin/src/brevoContacts/BrevoContactsPage.tsx | 3 +-- .../admin/src/emailCampaigns/EmailCampaignsGrid.tsx | 3 ++- packages/admin/src/targetGroups/TargetGroupsGrid.tsx | 3 ++- .../addContacts/AddContactsGridSelect.tsx | 3 ++- .../allAssignedContacts/AllAssignedContactsGrid.tsx | 12 ++++++++++-- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/demo/admin/src/common/brevoModuleConfig/brevoContactsPageAttributesConfig.tsx b/demo/admin/src/common/brevoModuleConfig/brevoContactsPageAttributesConfig.tsx index 9bb01e3d..f2a6fdee 100644 --- a/demo/admin/src/common/brevoModuleConfig/brevoContactsPageAttributesConfig.tsx +++ b/demo/admin/src/common/brevoModuleConfig/brevoContactsPageAttributesConfig.tsx @@ -1,7 +1,6 @@ -import { Field, FinalFormSelect, TextField } from "@comet/admin"; +import { Field, FinalFormSelect, GridColDef, TextField } from "@comet/admin"; import { EditBrevoContactFormValues } from "@comet/brevo-admin"; import { MenuItem } from "@mui/material"; -import { GridColDef } from "@mui/x-data-grid"; import { GQLBrevoContactSalutation } from "@src/graphql.generated"; import { DocumentNode } from "graphql"; import gql from "graphql-tag"; diff --git a/packages/admin/src/brevoContacts/BrevoContactsGrid.tsx b/packages/admin/src/brevoContacts/BrevoContactsGrid.tsx index b0e2cfaf..a1f28de0 100644 --- a/packages/admin/src/brevoContacts/BrevoContactsGrid.tsx +++ b/packages/admin/src/brevoContacts/BrevoContactsGrid.tsx @@ -1,6 +1,7 @@ import { DocumentNode, gql, useApolloClient, useQuery } from "@apollo/client"; import { DataGridToolbar, + GridColDef, MainContent, messages, RowActionsItem, @@ -17,7 +18,7 @@ import { import { Add, Block, Check, Delete, Edit } from "@comet/admin-icons"; import { ContentScopeInterface } from "@comet/cms-admin"; import { Button, IconButton } from "@mui/material"; -import { DataGrid, GridColDef, GridToolbarQuickFilter } from "@mui/x-data-grid"; +import { DataGrid, GridToolbarQuickFilter } from "@mui/x-data-grid"; import * as React from "react"; import { FormattedMessage, IntlShape, useIntl } from "react-intl"; diff --git a/packages/admin/src/brevoContacts/BrevoContactsPage.tsx b/packages/admin/src/brevoContacts/BrevoContactsPage.tsx index 09f69d7d..8ad01cb0 100644 --- a/packages/admin/src/brevoContacts/BrevoContactsPage.tsx +++ b/packages/admin/src/brevoContacts/BrevoContactsPage.tsx @@ -1,6 +1,5 @@ -import { Stack, StackPage, StackSwitch, StackToolbar } from "@comet/admin"; +import { GridColDef, Stack, StackPage, StackSwitch, StackToolbar } from "@comet/admin"; import { ContentScopeIndicator, useContentScope } from "@comet/cms-admin"; -import { GridColDef } from "@mui/x-data-grid"; import { DocumentNode } from "graphql"; import * as React from "react"; import { useIntl } from "react-intl"; diff --git a/packages/admin/src/emailCampaigns/EmailCampaignsGrid.tsx b/packages/admin/src/emailCampaigns/EmailCampaignsGrid.tsx index 80b359f1..0fb53c8e 100644 --- a/packages/admin/src/emailCampaigns/EmailCampaignsGrid.tsx +++ b/packages/admin/src/emailCampaigns/EmailCampaignsGrid.tsx @@ -2,6 +2,7 @@ import { gql, useApolloClient, useQuery } from "@apollo/client"; import { CrudContextMenu, DataGridToolbar, + GridColDef, GridFilterButton, MainContent, muiGridFilterToGql, @@ -19,7 +20,7 @@ import { Add as AddIcon, Edit, Statistics, Visible } from "@comet/admin-icons"; import { BlockInterface } from "@comet/blocks-admin"; import { ContentScopeInterface } from "@comet/cms-admin"; import { Button, IconButton } from "@mui/material"; -import { DataGrid, GridColDef, GridToolbarQuickFilter } from "@mui/x-data-grid"; +import { DataGrid, GridToolbarQuickFilter } from "@mui/x-data-grid"; import { isBefore } from "date-fns"; import * as React from "react"; import { FormattedMessage, useIntl } from "react-intl"; diff --git a/packages/admin/src/targetGroups/TargetGroupsGrid.tsx b/packages/admin/src/targetGroups/TargetGroupsGrid.tsx index 049c92e2..da36aef7 100644 --- a/packages/admin/src/targetGroups/TargetGroupsGrid.tsx +++ b/packages/admin/src/targetGroups/TargetGroupsGrid.tsx @@ -2,6 +2,7 @@ import { gql, useApolloClient, useQuery } from "@apollo/client"; import { CrudContextMenu, DataGridToolbar, + GridColDef, GridFilterButton, MainContent, muiGridFilterToGql, @@ -19,7 +20,7 @@ import { import { Add as AddIcon, Download, Edit } from "@comet/admin-icons"; import { ContentScopeInterface } from "@comet/cms-admin"; import { Button, IconButton } from "@mui/material"; -import { DataGrid, GridColDef, GridToolbarQuickFilter } from "@mui/x-data-grid"; +import { DataGrid, GridToolbarQuickFilter } from "@mui/x-data-grid"; import saveAs from "file-saver"; import { DocumentNode } from "graphql"; import * as React from "react"; diff --git a/packages/admin/src/targetGroups/addContacts/AddContactsGridSelect.tsx b/packages/admin/src/targetGroups/addContacts/AddContactsGridSelect.tsx index 9c17fc72..3c32c2b0 100644 --- a/packages/admin/src/targetGroups/addContacts/AddContactsGridSelect.tsx +++ b/packages/admin/src/targetGroups/addContacts/AddContactsGridSelect.tsx @@ -4,6 +4,7 @@ import { DataGridToolbar, Field, FinalForm, + GridColDef, ToolbarActions, ToolbarFillSpace, ToolbarItem, @@ -16,7 +17,7 @@ import { Add, Close, Remove, Save } from "@comet/admin-icons"; import { ContentScopeInterface } from "@comet/cms-admin"; import { Button, Dialog, DialogActions, DialogTitle, IconButton, useTheme } from "@mui/material"; import { Box } from "@mui/system"; -import { DataGrid, GridColDef, GridToolbarQuickFilter } from "@mui/x-data-grid"; +import { DataGrid, GridToolbarQuickFilter } from "@mui/x-data-grid"; import * as React from "react"; import { FormattedMessage, useIntl } from "react-intl"; import { MemoryRouter } from "react-router"; diff --git a/packages/admin/src/targetGroups/allAssignedContacts/AllAssignedContactsGrid.tsx b/packages/admin/src/targetGroups/allAssignedContacts/AllAssignedContactsGrid.tsx index b64ac4ee..203ebf1e 100644 --- a/packages/admin/src/targetGroups/allAssignedContacts/AllAssignedContactsGrid.tsx +++ b/packages/admin/src/targetGroups/allAssignedContacts/AllAssignedContactsGrid.tsx @@ -1,7 +1,15 @@ import { useQuery } from "@apollo/client"; -import { DataGridToolbar, ToolbarItem, ToolbarTitleItem, useBufferedRowCount, useDataGridRemote, usePersistentColumnState } from "@comet/admin"; +import { + DataGridToolbar, + GridColDef, + ToolbarItem, + ToolbarTitleItem, + useBufferedRowCount, + useDataGridRemote, + usePersistentColumnState, +} from "@comet/admin"; import { ContentScopeInterface } from "@comet/cms-admin"; -import { DataGrid, GridColDef, GridToolbarQuickFilter } from "@mui/x-data-grid"; +import { DataGrid, GridToolbarQuickFilter } from "@mui/x-data-grid"; import * as React from "react"; import { FormattedMessage, useIntl } from "react-intl"; From f59b88d90ecbad3c1902c40ec0171ed9e28e96b5 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Mon, 2 Sep 2024 09:49:10 +0200 Subject: [PATCH 22/45] API: Disable GraphQL field suggestions --- demo/api/src/app.module.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/demo/api/src/app.module.ts b/demo/api/src/app.module.ts index 78cd6e72..eca69b94 100644 --- a/demo/api/src/app.module.ts +++ b/demo/api/src/app.module.ts @@ -11,7 +11,7 @@ import { RedirectsModule, UserPermissionsModule, } from "@comet/cms-api"; -import { ApolloDriver } from "@nestjs/apollo"; +import { ApolloDriver, ApolloDriverConfig } from "@nestjs/apollo"; import { DynamicModule, Module } from "@nestjs/common"; import { ModuleRef } from "@nestjs/core"; import { Enhancer, GraphQLModule } from "@nestjs/graphql"; @@ -22,6 +22,7 @@ import { Page } from "@src/documents/pages/entities/page.entity"; import { PagesModule } from "@src/documents/pages/pages.module"; import { PageTreeNodeScope } from "@src/page-tree/dto/page-tree-node-scope"; import { PageTreeNode } from "@src/page-tree/entities/page-tree-node.entity"; +import { ValidationError } from "apollo-server-express"; import { Request } from "express"; import { AccessControlService } from "./auth/access-control.service"; @@ -49,13 +50,22 @@ export class AppModule { imports: [ ConfigModule.forRoot(config), DbModule, - GraphQLModule.forRootAsync({ + GraphQLModule.forRootAsync({ driver: ApolloDriver, imports: [BlocksModule], useFactory: (moduleRef: ModuleRef) => ({ debug: config.debug, playground: config.debug, autoSchemaFile: "schema.gql", + formatError: (error) => { + // Disable GraphQL field suggestions in production + if (process.env.NODE_ENV !== "development") { + if (error instanceof ValidationError) { + return new ValidationError("Invalid request."); + } + } + return error; + }, context: ({ req }: { req: Request }) => ({ ...req }), cors: { origin: config.corsAllowedOrigin, From 9e81ed02d5fe988dfb474f9fd619e2391f91d491 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Mon, 2 Sep 2024 09:50:21 +0200 Subject: [PATCH 23/45] Admin: Import admin theme types --- demo/admin/src/vendors.d.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/demo/admin/src/vendors.d.ts b/demo/admin/src/vendors.d.ts index 78b5af67..e4508ba8 100644 --- a/demo/admin/src/vendors.d.ts +++ b/demo/admin/src/vendors.d.ts @@ -1,3 +1,5 @@ +/// + /* eslint-disable @typescript-eslint/no-explicit-any */ declare module "*.svg" { const content: any; From b4fbe6da4a7a3acff691dcebc51683d1b506a408 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Mon, 2 Sep 2024 09:52:40 +0200 Subject: [PATCH 24/45] Admin: Replace Roboto with Roboto Flex --- demo/admin/package.json | 2 +- demo/admin/src/App.tsx | 5 +---- pnpm-lock.yaml | 10 +++++----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index af080d04..767b1e18 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -34,7 +34,7 @@ "@comet/cms-admin": "^7.2.1", "@emotion/react": "^11.9.3", "@emotion/styled": "^11.9.3", - "@fontsource/roboto": "^4.5.8", + "@fontsource-variable/roboto-flex": "^5.0.14", "@mui/icons-material": "^5.8.4", "@mui/lab": "^5.0.0-alpha.88", "@mui/material": "^5.8.6", diff --git a/demo/admin/src/App.tsx b/demo/admin/src/App.tsx index c69ac219..464c3f2b 100644 --- a/demo/admin/src/App.tsx +++ b/demo/admin/src/App.tsx @@ -1,7 +1,4 @@ -import "@fontsource/roboto/300.css"; -import "@fontsource/roboto/400.css"; -import "@fontsource/roboto/500.css"; -import "@fontsource/roboto/700.css"; +import "@fontsource-variable/roboto-flex/full.css"; import "material-design-icons/iconfont/material-icons.css"; import { ApolloProvider } from "@apollo/client"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3a7111bd..96e17037 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -80,9 +80,9 @@ importers: '@emotion/styled': specifier: ^11.9.3 version: 11.11.0(@emotion/react@11.11.3)(@types/react@17.0.75)(react@17.0.2) - '@fontsource/roboto': - specifier: ^4.5.8 - version: 4.5.8 + '@fontsource-variable/roboto-flex': + specifier: ^5.0.14 + version: 5.0.16 '@mui/icons-material': specifier: ^5.8.4 version: 5.14.5(@mui/material@5.15.5)(@types/react@17.0.75)(react@17.0.2) @@ -4558,8 +4558,8 @@ packages: /@floating-ui/utils@0.2.1: resolution: {integrity: sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==} - /@fontsource/roboto@4.5.8: - resolution: {integrity: sha512-CnD7zLItIzt86q4Sj3kZUiLcBk1dSk81qcqgMGaZe7SQ1P8hFNxhMl5AZthK1zrDM5m74VVhaOpuMGIL4gagaA==} + /@fontsource-variable/roboto-flex@5.0.16: + resolution: {integrity: sha512-aMJw0ac9M2fu78YUx5BRtdSqNqGV4cJPF6lbFpow8e0hXVH7wPwk5d0mpox1MTwvHFHRStmkYVB/SSUytmlaSw==} dev: false /@formatjs/cli@3.2.0: From 56547a1f2c7415186f96b30f6dbd9f952105f957 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Mon, 2 Sep 2024 09:57:10 +0200 Subject: [PATCH 25/45] Admin: Remove unnecessary fragments --- .../targetGroupFormConfig.tsx | 24 +++++++++---------- demo/admin/src/documents/links/EditLink.tsx | 2 +- demo/admin/src/documents/pages/EditPage.tsx | 2 +- .../emailCampaigns/form/EmailCampaignForm.tsx | 4 ++-- .../emailCampaigns/view/EmailCampaignView.tsx | 4 ++-- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/demo/admin/src/common/brevoModuleConfig/targetGroupFormConfig.tsx b/demo/admin/src/common/brevoModuleConfig/targetGroupFormConfig.tsx index 41afc6e1..4ca789a3 100644 --- a/demo/admin/src/common/brevoModuleConfig/targetGroupFormConfig.tsx +++ b/demo/admin/src/common/brevoModuleConfig/targetGroupFormConfig.tsx @@ -45,18 +45,16 @@ export const additionalFormConfig = { }, nodeFragment: additionalPageTreeNodeFieldsFragment, additionalFormFields: ( - <> - } name="filters.SALUTATION" fullWidth> - {(props) => ( - - {salutationOptions.map((option) => ( - - {option.label} - - ))} - - )} - - + } name="filters.SALUTATION" fullWidth> + {(props) => ( + + {salutationOptions.map((option) => ( + + {option.label} + + ))} + + )} + ), }; diff --git a/demo/admin/src/documents/links/EditLink.tsx b/demo/admin/src/documents/links/EditLink.tsx index a1d62678..cd4f7684 100644 --- a/demo/admin/src/documents/links/EditLink.tsx +++ b/demo/admin/src/documents/links/EditLink.tsx @@ -71,7 +71,7 @@ export const EditLink: React.FC = ({ id }) => { return ; } - if (!linkState) return <>; + if (!linkState) return null; return ( <> diff --git a/demo/admin/src/documents/pages/EditPage.tsx b/demo/admin/src/documents/pages/EditPage.tsx index 7cd0243d..edd63beb 100644 --- a/demo/admin/src/documents/pages/EditPage.tsx +++ b/demo/admin/src/documents/pages/EditPage.tsx @@ -90,7 +90,7 @@ export const EditPage: React.FC = ({ id, category }) => { }); } - if (!pageState) return <>; + if (!pageState) return null; if (loading) { return ; diff --git a/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx b/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx index f2d295a5..390de493 100644 --- a/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx +++ b/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx @@ -62,7 +62,7 @@ interface FormProps { scope: ContentScopeInterface; } -export function EmailCampaignForm({ id, EmailCampaignContentBlock, scope }: FormProps): React.ReactElement { +export function EmailCampaignForm({ id, EmailCampaignContentBlock, scope }: FormProps) { const rootBlocks = { content: EmailCampaignContentBlock, }; @@ -197,7 +197,7 @@ export function EmailCampaignForm({ id, EmailCampaignContentBlock, scope }: Form } if (!state) { - return <>; + return null; } if (error) throw error; diff --git a/packages/admin/src/emailCampaigns/view/EmailCampaignView.tsx b/packages/admin/src/emailCampaigns/view/EmailCampaignView.tsx index b472114f..639e1510 100644 --- a/packages/admin/src/emailCampaigns/view/EmailCampaignView.tsx +++ b/packages/admin/src/emailCampaigns/view/EmailCampaignView.tsx @@ -17,7 +17,7 @@ interface EmailCampaignViewProps { EmailCampaignContentBlock: BlockInterface; } -export function EmailCampaignView({ id, EmailCampaignContentBlock }: EmailCampaignViewProps): React.ReactElement { +export function EmailCampaignView({ id, EmailCampaignContentBlock }: EmailCampaignViewProps) { const stackApi = useStackApi(); const previewApi = useBlockPreview(); const blockContext = useCmsBlockContext(); @@ -36,7 +36,7 @@ export function EmailCampaignView({ id, EmailCampaignContentBlock }: EmailCampai } if (!data) { - return <>; + return null; } const previewContext = { From 5db3fb7304661fad68ed9fc46a38db81cfa4e378 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Mon, 2 Sep 2024 09:57:37 +0200 Subject: [PATCH 26/45] Admin: Remove custom ContentScopeIndicator from PagesPage --- demo/admin/src/Routes.tsx | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/demo/admin/src/Routes.tsx b/demo/admin/src/Routes.tsx index 69980857..2e31869a 100644 --- a/demo/admin/src/Routes.tsx +++ b/demo/admin/src/Routes.tsx @@ -1,5 +1,4 @@ import { MasterLayout, RouteWithErrorBoundary } from "@comet/admin"; -import { Domain } from "@comet/admin-icons"; import { createBrevoContactsPage, createEmailCampaignsPage, createTargetGroupsPage } from "@comet/brevo-admin"; import { ContentScopeIndicator, createRedirectsPage, DamPage, PagesPage, PublisherPage, SitePreview } from "@comet/cms-admin"; import { getBrevoContactConfig } from "@src/common/brevoModuleConfig/brevoContactsPageAttributesConfig"; @@ -10,8 +9,7 @@ import { RouteComponentProps } from "react-router"; import { Redirect, Route, Switch } from "react-router-dom"; import { additionalFormConfig } from "./common/brevoModuleConfig/targetGroupFormConfig"; -import { ContentScopeIndicatorContent, ContentScopeIndicatorDomain, ContentScopeIndicatorLanguage } from "./common/ContentScopeIndicatorStyles"; -import { ContentScopeProvider } from "./common/ContentScopeProvider"; +import { ContentScope, ContentScopeProvider } from "./common/ContentScopeProvider"; import { MasterHeader } from "./common/MasterHeader"; import { MasterMenu } from "./common/MasterMenu"; import { DashboardPage } from "./dashboard/DashboardPage"; @@ -74,20 +72,7 @@ export const Routes: React.FC = () => { allCategories={pageTreeCategories} path={`/pages/pagetree/${params.category}`} documentTypes={{ Page, Link }} - renderContentScopeIndicator={(scope) => ( - - - - - {scope.domain} - - {" | "} - - {scope.language} - - - - )} + renderContentScopeIndicator={(scope: ContentScope) => } /> ); }} From fc2511c8d3088af105b9717582673297e0ba3a00 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Mon, 2 Sep 2024 09:58:18 +0200 Subject: [PATCH 27/45] Admin: Import YouTubeVideoBlock from @comet/cms-admin package --- demo/admin/src/documents/pages/blocks/PageContentBlock.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/admin/src/documents/pages/blocks/PageContentBlock.tsx b/demo/admin/src/documents/pages/blocks/PageContentBlock.tsx index 1f7acd6f..35eea2d7 100644 --- a/demo/admin/src/documents/pages/blocks/PageContentBlock.tsx +++ b/demo/admin/src/documents/pages/blocks/PageContentBlock.tsx @@ -1,5 +1,5 @@ -import { createBlocksBlock, SpaceBlock, YouTubeVideoBlock } from "@comet/blocks-admin"; -import { DamImageBlock, DamVideoBlock } from "@comet/cms-admin"; +import { createBlocksBlock, SpaceBlock } from "@comet/blocks-admin"; +import { DamImageBlock, DamVideoBlock, YouTubeVideoBlock } from "@comet/cms-admin"; import { HeadlineBlock } from "@src/common/blocks/HeadlineBlock"; import { LinkListBlock } from "@src/common/blocks/LinkListBlock"; import { RichTextBlock } from "@src/common/blocks/RichTextBlock"; From e7bebbe8cb8eca2ae9e9d6dd955d702ef20e6ee8 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Mon, 2 Sep 2024 09:59:57 +0200 Subject: [PATCH 28/45] Admin: Import ContentScopeControls from @comet/cms-admin --- demo/admin/src/common/MasterHeader.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/demo/admin/src/common/MasterHeader.tsx b/demo/admin/src/common/MasterHeader.tsx index 06104704..cb511611 100644 --- a/demo/admin/src/common/MasterHeader.tsx +++ b/demo/admin/src/common/MasterHeader.tsx @@ -1,8 +1,6 @@ -import { BuildEntry, Header, UserHeaderItem } from "@comet/cms-admin"; +import { BuildEntry, ContentScopeControls, Header, UserHeaderItem } from "@comet/cms-admin"; import * as React from "react"; -import { ContentScopeControls } from "./ContentScopeProvider"; - export const MasterHeader: React.FC = () => { return (
From 10d953c4e2291b837f5f7fd24bafb3c266ef00c2 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Mon, 2 Sep 2024 10:03:38 +0200 Subject: [PATCH 29/45] Admin: Prettier ignore build folder --- demo/admin/.prettierignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/demo/admin/.prettierignore b/demo/admin/.prettierignore index c87319e3..1009a5c0 100644 --- a/demo/admin/.prettierignore +++ b/demo/admin/.prettierignore @@ -2,4 +2,5 @@ block-meta.json lang-compiled/ lang/ schema.json -src/fragmentTypes.json \ No newline at end of file +src/fragmentTypes.json +build/ From a3c3b60f40e8004beeaae657dba4c5a883e4229e Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Mon, 2 Sep 2024 10:17:16 +0200 Subject: [PATCH 30/45] Site: Various changes --- demo/site/next.config.js | 3 + demo/site/package.json | 14 +- demo/site/src/common/blocks/DamImageBlock.tsx | 4 +- demo/site/src/common/blocks/DamVideoBlock.tsx | 18 - demo/site/src/common/blocks/LinkBlock.tsx | 12 +- demo/site/src/common/blocks/RichTextBlock.tsx | 2 +- .../pages/blocks/PageContentBlock.tsx | 3 +- pnpm-lock.yaml | 394 ++++++++++++++++-- 8 files changed, 375 insertions(+), 75 deletions(-) delete mode 100644 demo/site/src/common/blocks/DamVideoBlock.tsx diff --git a/demo/site/next.config.js b/demo/site/next.config.js index 8591085a..5c77df5c 100644 --- a/demo/site/next.config.js +++ b/demo/site/next.config.js @@ -63,6 +63,9 @@ const nextConfig = { compiler: { styledComponents: true, }, + experimental: { + optimizePackageImports: ["@comet/cms-site"], + }, // https://nextjs.org/docs/advanced-features/security-headers headers: async () => [ { diff --git a/demo/site/package.json b/demo/site/package.json index c7b16750..4cc95e98 100644 --- 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": "^6.8.0", + "@comet/cms-site": "^7.2.1", "@next/bundle-analyzer": "^12.3.4", "@opentelemetry/api": "^1.7.0", "@opentelemetry/auto-instrumentations-node": "^0.40.0", @@ -37,20 +37,20 @@ "graphql": "^15.0.0", "graphql-request": "^3.0.0", "graphql-tag": "^2.12.6", - "next": "^12.0.0", - "react": "^17.0.0", - "react-dom": "^17.0.0", + "next": "^14.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-intl": "^5.0.0", "react-is": "^17.0.2", "redraft": "^0.10.0", "sitemap": "^6.0.0", - "styled-components": "^5.0.0", + "styled-components": "^6.0.0", "ts-node": "^10.0.0" }, "devDependencies": { "@babel/core": "^7.16.0", - "@comet/cli": "^6.8.0", - "@comet/eslint-config": "^6.8.0", + "@comet/cli": "^7.2.1", + "@comet/eslint-config": "^7.2.1", "@formatjs/cli": "^4.2.33", "@gitbeaker/node": "^35.6.0", "@graphql-codegen/add": "^3.0.0", diff --git a/demo/site/src/common/blocks/DamImageBlock.tsx b/demo/site/src/common/blocks/DamImageBlock.tsx index f08ddce1..c8dc42ae 100644 --- a/demo/site/src/common/blocks/DamImageBlock.tsx +++ b/demo/site/src/common/blocks/DamImageBlock.tsx @@ -6,7 +6,7 @@ import * as React from "react"; import { NextImageBottomPaddingFix } from "../NextImageBottomPaddingFix"; type Props = PropsWithData & - Omit & { + Omit & { aspectRatio?: string; } & ( | { layout?: "fixed" | "intrinsic" } @@ -27,7 +27,7 @@ export const DamImageBlock = withPreview( if (block.type === "pixelImage") { return ( - + ); } else if (block.type === "svgImage") { diff --git a/demo/site/src/common/blocks/DamVideoBlock.tsx b/demo/site/src/common/blocks/DamVideoBlock.tsx deleted file mode 100644 index aae12354..00000000 --- a/demo/site/src/common/blocks/DamVideoBlock.tsx +++ /dev/null @@ -1,18 +0,0 @@ -import { PreviewSkeleton, PropsWithData, withPreview } from "@comet/cms-site"; -import { DamVideoBlockData } from "@src/blocks.generated"; -import * as React from "react"; - -export const DamVideoBlock = withPreview( - ({ data: { damFile, autoplay, showControls } }: PropsWithData) => { - if (damFile === undefined) { - return ; - } - - return ( - - ); - }, - { label: "Video" }, -); diff --git a/demo/site/src/common/blocks/LinkBlock.tsx b/demo/site/src/common/blocks/LinkBlock.tsx index 947e13d8..046a968a 100644 --- a/demo/site/src/common/blocks/LinkBlock.tsx +++ b/demo/site/src/common/blocks/LinkBlock.tsx @@ -13,9 +13,17 @@ export const LinkBlock = withPreview( } if (block.type === "internal") { - return {children}; + return ( + + {children} + + ); } else { - return {children}; + return ( + + {children} + + ); } }, { label: "Link" }, diff --git a/demo/site/src/common/blocks/RichTextBlock.tsx b/demo/site/src/common/blocks/RichTextBlock.tsx index 1462536f..bec68d8c 100644 --- a/demo/site/src/common/blocks/RichTextBlock.tsx +++ b/demo/site/src/common/blocks/RichTextBlock.tsx @@ -108,7 +108,7 @@ export const RichTextBlock = withPreview( const rendered = redraft(draftContent, renderers); return ( - + {rendered} ); diff --git a/demo/site/src/documents/pages/blocks/PageContentBlock.tsx b/demo/site/src/documents/pages/blocks/PageContentBlock.tsx index c571d753..b8cd5e6a 100644 --- a/demo/site/src/documents/pages/blocks/PageContentBlock.tsx +++ b/demo/site/src/documents/pages/blocks/PageContentBlock.tsx @@ -1,7 +1,6 @@ -import { BlocksBlock, PropsWithData, SupportedBlocks, YouTubeVideoBlock } from "@comet/cms-site"; +import { BlocksBlock, DamVideoBlock, PropsWithData, SupportedBlocks, YouTubeVideoBlock } from "@comet/cms-site"; import { PageContentBlockData } from "@src/blocks.generated"; import { DamImageBlock } from "@src/common/blocks/DamImageBlock"; -import { DamVideoBlock } from "@src/common/blocks/DamVideoBlock"; import { HeadlineBlock } from "@src/common/blocks/HeadlineBlock"; import { LinkListBlock } from "@src/common/blocks/LinkListBlock"; import { RichTextBlock } from "@src/common/blocks/RichTextBlock"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 96e17037..b5f1ea89 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -164,7 +164,7 @@ importers: version: 7.2.1(ts-node@10.9.2) '@comet/eslint-config': specifier: ^7.2.1 - version: 7.2.1(eslint@8.56.0)(prettier@2.8.8)(ts-jest@29.1.1)(typescript@4.9.5) + version: 7.2.1(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5) '@emotion/babel-plugin': specifier: ^11.0.0 version: 11.11.0 @@ -645,8 +645,8 @@ importers: demo/site: dependencies: '@comet/cms-site': - specifier: ^6.8.0 - version: 6.8.0(next@12.3.4)(react-dom@17.0.2)(react@17.0.2)(styled-components@5.3.11) + specifier: ^7.2.1 + version: 7.2.1(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) '@next/bundle-analyzer': specifier: ^12.3.4 version: 12.3.4 @@ -664,7 +664,7 @@ importers: version: 0.46.0(@opentelemetry/api@1.7.0) draft-js: specifier: ^0.11.7 - version: 0.11.7(react-dom@17.0.2)(react@17.0.2) + version: 0.11.7(react-dom@18.3.1)(react@18.3.1) express: specifier: ^4.0.0 version: 4.18.2 @@ -681,17 +681,17 @@ importers: specifier: ^2.12.6 version: 2.12.6(graphql@15.8.0) next: - specifier: ^12.0.0 - version: 12.3.4(@babel/core@7.23.7)(react-dom@17.0.2)(react@17.0.2) + specifier: ^14.0.0 + version: 14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(react-dom@18.3.1)(react@18.3.1) react: - specifier: ^17.0.0 - version: 17.0.2 + specifier: ^18.0.0 + version: 18.3.1 react-dom: - specifier: ^17.0.0 - version: 17.0.2(react@17.0.2) + specifier: ^18.0.0 + version: 18.3.1(react@18.3.1) react-intl: specifier: ^5.0.0 - version: 5.25.1(react@17.0.2)(typescript@4.9.5) + version: 5.25.1(react@18.3.1)(typescript@4.9.5) react-is: specifier: ^17.0.2 version: 17.0.2 @@ -702,8 +702,8 @@ importers: specifier: ^6.0.0 version: 6.4.0 styled-components: - specifier: ^5.0.0 - version: 5.3.11(@babel/core@7.23.7)(react-dom@17.0.2)(react-is@17.0.2)(react@17.0.2) + specifier: ^6.0.0 + version: 6.1.13(react-dom@18.3.1)(react@18.3.1) ts-node: specifier: ^10.0.0 version: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) @@ -712,11 +712,11 @@ importers: specifier: ^7.16.0 version: 7.23.7 '@comet/cli': - specifier: ^6.8.0 - version: 6.8.0 + specifier: ^7.2.1 + version: 7.2.1(ts-node@10.9.2) '@comet/eslint-config': - specifier: ^6.8.0 - version: 6.8.0(eslint@8.56.0)(next@12.3.4)(prettier@2.8.8)(typescript@4.9.5) + specifier: ^7.2.1 + version: 7.2.1(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5) '@formatjs/cli': specifier: ^4.2.33 version: 4.8.4 @@ -828,7 +828,7 @@ importers: version: 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd-html5-backend@16.0.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/eslint-config': specifier: ^7.2.1 - version: 7.2.1(eslint@8.56.0)(prettier@2.8.8)(ts-jest@29.1.1)(typescript@4.9.5) + version: 7.2.1(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5) '@emotion/react': specifier: ^11.9.3 version: 11.11.3(@types/react@17.0.75)(react@17.0.2) @@ -3953,14 +3953,6 @@ packages: class-validator: 0.13.2 rimraf: 3.0.2 - /@comet/cli@6.8.0: - resolution: {integrity: sha512-COPWyYzZFD+pfcLNM3+1Tq1GCDzZ++XAghBU0KArxEF/IIbsoR0q+N7L8GBcQJprdLN/meYoj5rFYIb1mzEsTQ==} - hasBin: true - dependencies: - commander: 9.5.0 - prettier: 2.8.8 - dev: true - /@comet/cli@6.9.0: resolution: {integrity: sha512-l3VnBjipD5Ij0fqZ2yIoPc5u659B/0VgaZTu4Vk64quvpjTn0C8gCGU/1HipGHrt8bI+e341OwbPZbem14egIg==} hasBin: true @@ -4156,8 +4148,8 @@ packages: - encoding - supports-color - /@comet/cms-site@6.8.0(next@12.3.4)(react-dom@17.0.2)(react@17.0.2)(styled-components@5.3.11): - resolution: {integrity: sha512-VXQx4cS70ra0UHIFkvv++SFOvHswPh/K542wKsNig3AmXGB7CVj7k5IqSi5hOBi+OO9SFywRKKtlxhO5TNT8BA==} + /@comet/cms-site@6.9.0(next@12.3.4)(react-dom@17.0.2)(react@17.0.2)(styled-components@5.3.11): + resolution: {integrity: sha512-+RfB6ARExsytZvKkMUvobUmlfQZUCziYVpj7+4G4tRAGD1z429pwfX6IkkZ47CcwXLFrdf/hRWcezUl7s4VymA==} peerDependencies: next: ^12.0.0 react: ^17.0.0 @@ -4177,25 +4169,23 @@ packages: - supports-color dev: false - /@comet/cms-site@6.9.0(next@12.3.4)(react-dom@17.0.2)(react@17.0.2)(styled-components@5.3.11): - resolution: {integrity: sha512-+RfB6ARExsytZvKkMUvobUmlfQZUCziYVpj7+4G4tRAGD1z429pwfX6IkkZ47CcwXLFrdf/hRWcezUl7s4VymA==} + /@comet/cms-site@7.2.1(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13): + resolution: {integrity: sha512-pLOjZmh920hOUNSDjOvXjFqivsWayO8MkqZTMvqClPwtXSfB8J0AX2XAQ8hlWWa1L33wv10Ze8bwrxmEXOMVcQ==} peerDependencies: - next: ^12.0.0 - react: ^17.0.0 - react-dom: ^17.0.0 - styled-components: ^5.0.0 + next: '14' + react: ^18.0.0 + react-dom: ^18.0.0 + styled-components: ^6.0.0 dependencies: - jsonwebtoken: 8.5.1 - jwks-rsa: 3.1.0 - next: 12.3.4(@babel/core@7.23.7)(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + jose: 5.8.0 + next: 14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) rimraf: 3.0.2 scroll-into-view-if-needed: 2.2.31 - styled-components: 5.3.11(@babel/core@7.23.7)(react-dom@17.0.2)(react-is@17.0.2)(react@17.0.2) - use-debounce: 6.0.1(react@17.0.2) - transitivePeerDependencies: - - supports-color + server-only: 0.0.1 + styled-components: 6.1.13(react-dom@18.3.1)(react@18.3.1) + use-debounce: 6.0.1(react@18.3.1) dev: false /@comet/dev-process-manager@2.5.1: @@ -4253,6 +4243,44 @@ packages: - typescript dev: true + /@comet/eslint-config@7.2.1(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5): + resolution: {integrity: sha512-bn9wTTRcJ/Q4Zl1Rzgp1wP2SQGh2zQff+ATPUctsta89yV9odPV8fHWL8DkmrVKuLpQXm0FLvRaPNK+33f0V8Q==} + peerDependencies: + eslint: '>= 8' + next: '*' + prettier: ^2.0.0 + peerDependenciesMeta: + next: + optional: true + dependencies: + '@calm/eslint-plugin-react-intl': 1.4.1 + '@comet/eslint-plugin': 7.2.1(eslint@8.56.0) + '@next/eslint-plugin-next': 14.2.7 + '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@4.9.5) + '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@4.9.5) + eslint: 8.56.0 + eslint-config-next: 14.2.7(eslint@8.56.0)(typescript@4.9.5) + eslint-config-prettier: 8.10.0(eslint@8.56.0) + eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.56.0) + eslint-plugin-formatjs: 4.12.1(eslint@8.56.0)(ts-jest@29.1.1) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0) + eslint-plugin-json-files: 2.2.0(eslint@8.56.0) + eslint-plugin-prettier: 4.2.1(eslint-config-prettier@8.10.0)(eslint@8.56.0)(prettier@2.8.8) + eslint-plugin-react: 7.33.2(eslint@8.56.0) + eslint-plugin-react-hooks: 4.6.0(eslint@8.56.0) + eslint-plugin-simple-import-sort: 9.0.0(eslint@8.56.0) + eslint-plugin-unused-imports: 2.0.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.56.0) + next: 14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(react-dom@18.3.1)(react@18.3.1) + npm-run-all: 4.1.5 + prettier: 2.8.8 + transitivePeerDependencies: + - eslint-import-resolver-node + - eslint-import-resolver-webpack + - supports-color + - ts-jest + - typescript + dev: true + /@comet/eslint-config@7.2.1(eslint@8.56.0)(prettier@2.8.8)(ts-jest@27.1.5)(typescript@4.9.5): resolution: {integrity: sha512-bn9wTTRcJ/Q4Zl1Rzgp1wP2SQGh2zQff+ATPUctsta89yV9odPV8fHWL8DkmrVKuLpQXm0FLvRaPNK+33f0V8Q==} peerDependencies: @@ -4385,6 +4413,12 @@ packages: dependencies: '@emotion/memoize': 0.8.1 + /@emotion/is-prop-valid@1.2.2: + resolution: {integrity: sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw==} + dependencies: + '@emotion/memoize': 0.8.1 + dev: false + /@emotion/memoize@0.8.1: resolution: {integrity: sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==} @@ -6918,6 +6952,9 @@ packages: /@next/env@12.3.4: resolution: {integrity: sha512-H/69Lc5Q02dq3o+dxxy5O/oNxFsZpdL6WREtOOtOM1B/weonIwDXkekr1KV5DPVPr12IHFPrMrcJQ6bgPMfn7A==} + /@next/env@14.2.7: + resolution: {integrity: sha512-OTx9y6I3xE/eih+qtthppwLytmpJVPM5PPoJxChFsbjIEFXIayG0h/xLzefHGJviAa3Q5+Fd+9uYojKkHDKxoQ==} + /@next/eslint-plugin-next@12.3.4: resolution: {integrity: sha512-BFwj8ykJY+zc1/jWANsDprDIu2MgwPOIKxNVnrKvPs+f5TPegrVnem8uScND+1veT4B7F6VeqgaNLFW1Hzl9Og==} dependencies: @@ -6960,6 +6997,14 @@ packages: requiresBuild: true optional: true + /@next/swc-darwin-arm64@14.2.7: + resolution: {integrity: sha512-UhZGcOyI9LE/tZL3h9rs/2wMZaaJKwnpAyegUVDGZqwsla6hMfeSj9ssBWQS9yA4UXun3pPhrFLVnw5KXZs3vw==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + optional: true + /@next/swc-darwin-x64@12.3.4: resolution: {integrity: sha512-PPF7tbWD4k0dJ2EcUSnOsaOJ5rhT3rlEt/3LhZUGiYNL8KvoqczFrETlUx0cUYaXe11dRA3F80Hpt727QIwByQ==} engines: {node: '>= 10'} @@ -6968,6 +7013,14 @@ packages: requiresBuild: true optional: true + /@next/swc-darwin-x64@14.2.7: + resolution: {integrity: sha512-ys2cUgZYRc+CbyDeLAaAdZgS7N1Kpyy+wo0b/gAj+SeOeaj0Lw/q+G1hp+DuDiDAVyxLBCJXEY/AkhDmtihUTA==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + requiresBuild: true + optional: true + /@next/swc-freebsd-x64@12.3.4: resolution: {integrity: sha512-KM9JXRXi/U2PUM928z7l4tnfQ9u8bTco/jb939pdFUHqc28V43Ohd31MmZD1QzEK4aFlMRaIBQOWQZh4D/E5lQ==} engines: {node: '>= 10'} @@ -6992,6 +7045,14 @@ packages: requiresBuild: true optional: true + /@next/swc-linux-arm64-gnu@14.2.7: + resolution: {integrity: sha512-2xoWtE13sUJ3qrC1lwE/HjbDPm+kBQYFkkiVECJWctRASAHQ+NwjMzgrfqqMYHfMxFb5Wws3w9PqzZJqKFdWcQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + requiresBuild: true + optional: true + /@next/swc-linux-arm64-musl@12.3.4: resolution: {integrity: sha512-EETZPa1juczrKLWk5okoW2hv7D7WvonU+Cf2CgsSoxgsYbUCZ1voOpL4JZTOb6IbKMDo6ja+SbY0vzXZBUMvkQ==} engines: {node: '>= 10'} @@ -7000,6 +7061,14 @@ packages: requiresBuild: true optional: true + /@next/swc-linux-arm64-musl@14.2.7: + resolution: {integrity: sha512-+zJ1gJdl35BSAGpkCbfyiY6iRTaPrt3KTl4SF/B1NyELkqqnrNX6cp4IjjjxKpd64/7enI0kf6b9O1Uf3cL0pw==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + requiresBuild: true + optional: true + /@next/swc-linux-x64-gnu@12.3.4: resolution: {integrity: sha512-4csPbRbfZbuWOk3ATyWcvVFdD9/Rsdq5YHKvRuEni68OCLkfy4f+4I9OBpyK1SKJ00Cih16NJbHE+k+ljPPpag==} engines: {node: '>= 10'} @@ -7008,6 +7077,14 @@ packages: requiresBuild: true optional: true + /@next/swc-linux-x64-gnu@14.2.7: + resolution: {integrity: sha512-m6EBqrskeMUzykBrv0fDX/28lWIBGhMzOYaStp0ihkjzIYJiKUOzVYD1gULHc8XDf5EMSqoH/0/TRAgXqpQwmw==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + requiresBuild: true + optional: true + /@next/swc-linux-x64-musl@12.3.4: resolution: {integrity: sha512-YeBmI+63Ro75SUiL/QXEVXQ19T++58aI/IINOyhpsRL1LKdyfK/35iilraZEFz9bLQrwy1LYAR5lK200A9Gjbg==} engines: {node: '>= 10'} @@ -7016,6 +7093,14 @@ packages: requiresBuild: true optional: true + /@next/swc-linux-x64-musl@14.2.7: + resolution: {integrity: sha512-gUu0viOMvMlzFRz1r1eQ7Ql4OE+hPOmA7smfZAhn8vC4+0swMZaZxa9CSIozTYavi+bJNDZ3tgiSdMjmMzRJlQ==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + requiresBuild: true + optional: true + /@next/swc-win32-arm64-msvc@12.3.4: resolution: {integrity: sha512-Sd0qFUJv8Tj0PukAYbCCDbmXcMkbIuhnTeHm9m4ZGjCf6kt7E/RMs55Pd3R5ePjOkN7dJEuxYBehawTR/aPDSQ==} engines: {node: '>= 10'} @@ -7024,6 +7109,14 @@ packages: requiresBuild: true optional: true + /@next/swc-win32-arm64-msvc@14.2.7: + resolution: {integrity: sha512-PGbONHIVIuzWlYmLvuFKcj+8jXnLbx4WrlESYlVnEzDsa3+Q2hI1YHoXaSmbq0k4ZwZ7J6sWNV4UZfx1OeOlbQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [win32] + requiresBuild: true + optional: true + /@next/swc-win32-ia32-msvc@12.3.4: resolution: {integrity: sha512-rt/vv/vg/ZGGkrkKcuJ0LyliRdbskQU+91bje+PgoYmxTZf/tYs6IfbmgudBJk6gH3QnjHWbkphDdRQrseRefQ==} engines: {node: '>= 10'} @@ -7032,6 +7125,14 @@ packages: requiresBuild: true optional: true + /@next/swc-win32-ia32-msvc@14.2.7: + resolution: {integrity: sha512-BiSY5umlx9ed5RQDoHcdbuKTUkuFORDqzYKPHlLeS+STUWQKWziVOn3Ic41LuTBvqE0TRJPKpio9GSIblNR+0w==} + engines: {node: '>= 10'} + cpu: [ia32] + os: [win32] + requiresBuild: true + optional: true + /@next/swc-win32-x64-msvc@12.3.4: resolution: {integrity: sha512-DQ20JEfTBZAgF8QCjYfJhv2/279M6onxFjdG/+5B0Cyj00/EdBxiWb2eGGFgQhrBbNv/lsvzFbbi0Ptf8Vw/bg==} engines: {node: '>= 10'} @@ -7040,6 +7141,14 @@ packages: requiresBuild: true optional: true + /@next/swc-win32-x64-msvc@14.2.7: + resolution: {integrity: sha512-pxsI23gKWRt/SPHFkDEsP+w+Nd7gK37Hpv0ngc5HpWy2e7cKx9zR/+Q2ptAUqICNTecAaGWvmhway7pj/JLEWA==} + engines: {node: '>= 10'} + cpu: [x64] + os: [win32] + requiresBuild: true + optional: true + /@nicolo-ribaudo/chokidar-2@2.1.8-no-fsevents.3: resolution: {integrity: sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==} requiresBuild: true @@ -8615,11 +8724,20 @@ packages: '@smithy/types': 3.3.0 tslib: 2.6.2 + /@swc/counter@0.1.3: + resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==} + /@swc/helpers@0.4.11: resolution: {integrity: sha512-rEUrBSGIoSFuYxwBYtlUFMlE2CwGhmW+w9355/5oduSw8e5h2+Tj4UrAGNNgP9915++wj5vkQo0UuOBqOAq4nw==} dependencies: tslib: 2.6.2 + /@swc/helpers@0.5.5: + resolution: {integrity: sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==} + dependencies: + '@swc/counter': 0.1.3 + tslib: 2.6.2 + /@szmarczak/http-timer@4.0.6: resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==} engines: {node: '>=10'} @@ -9271,6 +9389,10 @@ packages: csstype: 3.1.3 dev: true + /@types/stylis@4.2.5: + resolution: {integrity: sha512-1Xve+NMN7FWjY14vLoY5tL3BVEQ/n42YLwaqJIPYhotZ9uBHt87VceMwWQpzmdEt2TNXIorIFG+YeCUUW7RInw==} + dev: false + /@types/tedious@4.0.14: resolution: {integrity: sha512-KHPsfX/FoVbUGbyYvk1q9MMQHLPeRZhRJZdO45Q4YjvFkv4hMNghCWTvy7rdKessBsmtz4euWCWAB6/tVpI1Iw==} dependencies: @@ -10939,6 +11061,9 @@ packages: /caniuse-lite@1.0.30001578: resolution: {integrity: sha512-J/jkFgsQ3NEl4w2lCoM9ZPxrD+FoBNJ7uJUpGVjIg/j0OwJosWM36EPDv+Yyi0V4twBk9pPmlFS+PLykgEvUmg==} + /caniuse-lite@1.0.30001655: + resolution: {integrity: sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==} + /capital-case@1.0.4: resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==} dependencies: @@ -11172,6 +11297,9 @@ packages: engines: {node: '>= 10'} dev: true + /client-only@0.0.1: + resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==} + /clipboard-copy@4.0.1: resolution: {integrity: sha512-wOlqdqziE/NNTUJsfSgXmBMIrYmfd5V0HCGsR8uAKHcg+h9NENWINcfRjtWGU77wDHC8B8ijV4hMTGYbrKovng==} @@ -12166,6 +12294,21 @@ packages: transitivePeerDependencies: - encoding + /draft-js@0.11.7(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-ne7yFfN4sEL82QPQEn80xnADR8/Q6ALVworbC5UOSzOvjffmYfFsr3xSZtxbIirti14R7Y33EZC5rivpLgIbsg==} + peerDependencies: + react: '>=0.14.0' + react-dom: '>=0.14.0' + dependencies: + fbjs: 2.0.0 + immutable: 3.7.6 + object-assign: 4.1.1 + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + transitivePeerDependencies: + - encoding + dev: false + /draftjs-conductor@3.0.0(draft-js@0.11.7): resolution: {integrity: sha512-OjFRwOT41IVKUvdOC/jnLl9CYMP8mVbonVh5MS9Ud2LGOhllWFFFqz90uc9vUAh3DPMHe5iMFGSqXUSW6a5PFw==} peerDependencies: @@ -15830,6 +15973,10 @@ packages: /jose@4.15.4: resolution: {integrity: sha512-W+oqK4H+r5sITxfxpSU+MMdr/YSWGvgZMQDIsNoBDGGy4i7GBPTtvFKibQzW06n3U3TqHjhvBJsirShsEJ6eeQ==} + /jose@5.8.0: + resolution: {integrity: sha512-E7CqYpL/t7MMnfGnK/eg416OsFCVUrU/Y3Vwe7QjKhu/BkS1Ms455+2xsqZQVN57/U2MHMBvEb5SrmAZWAIntA==} + dev: false + /jpeg-js@0.4.4: resolution: {integrity: sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==} @@ -17402,6 +17549,48 @@ packages: - '@babel/core' - babel-plugin-macros + /next@14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-4Qy2aK0LwH4eQiSvQWyKuC7JXE13bIopEQesWE0c/P3uuNRnZCQanI0vsrMLmUQJLAto+A+/8+sve2hd+BQuOQ==} + engines: {node: '>=18.17.0'} + hasBin: true + peerDependencies: + '@opentelemetry/api': ^1.1.0 + '@playwright/test': ^1.41.2 + react: ^18.2.0 + react-dom: ^18.2.0 + sass: ^1.3.0 + peerDependenciesMeta: + '@opentelemetry/api': + optional: true + '@playwright/test': + optional: true + sass: + optional: true + dependencies: + '@next/env': 14.2.7 + '@opentelemetry/api': 1.7.0 + '@swc/helpers': 0.5.5 + busboy: 1.6.0 + caniuse-lite: 1.0.30001655 + graceful-fs: 4.2.11 + postcss: 8.4.31 + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + styled-jsx: 5.1.1(@babel/core@7.23.7)(react@18.3.1) + optionalDependencies: + '@next/swc-darwin-arm64': 14.2.7 + '@next/swc-darwin-x64': 14.2.7 + '@next/swc-linux-arm64-gnu': 14.2.7 + '@next/swc-linux-arm64-musl': 14.2.7 + '@next/swc-linux-x64-gnu': 14.2.7 + '@next/swc-linux-x64-musl': 14.2.7 + '@next/swc-win32-arm64-msvc': 14.2.7 + '@next/swc-win32-ia32-msvc': 14.2.7 + '@next/swc-win32-x64-msvc': 14.2.7 + transitivePeerDependencies: + - '@babel/core' + - babel-plugin-macros + /nice-try@1.0.5: resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} dev: true @@ -18266,6 +18455,14 @@ packages: picocolors: 1.0.0 source-map-js: 1.0.2 + /postcss@8.4.31: + resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==} + engines: {node: ^10 || ^12 || >=14} + dependencies: + nanoid: 3.3.7 + picocolors: 1.0.0 + source-map-js: 1.0.2 + /postcss@8.4.33: resolution: {integrity: sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==} engines: {node: ^10 || ^12 || >=14} @@ -18275,6 +18472,15 @@ packages: source-map-js: 1.0.2 dev: true + /postcss@8.4.38: + resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==} + engines: {node: ^10 || ^12 || >=14} + dependencies: + nanoid: 3.3.7 + picocolors: 1.0.0 + source-map-js: 1.2.0 + dev: false + /postgres-array@2.0.0: resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==} engines: {node: '>=4'} @@ -18641,6 +18847,15 @@ packages: react: 17.0.2 scheduler: 0.20.2 + /react-dom@18.3.1(react@18.3.1): + resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==} + peerDependencies: + react: ^18.3.1 + dependencies: + loose-envify: 1.4.0 + react: 18.3.1 + scheduler: 0.23.2 + /react-dropzone@14.2.3(react@17.0.2): resolution: {integrity: sha512-O3om8I+PkFKbxCukfIR3QAGftYXDZfOE2N1mr/7qebQJHs7U+/RSL/9xomJNpRg9kM5h9soQSdf0Gc7OHF5Fug==} engines: {node: '>= 10.13'} @@ -18717,6 +18932,29 @@ packages: tslib: 2.6.2 typescript: 4.9.5 + /react-intl@5.25.1(react@18.3.1)(typescript@4.9.5): + resolution: {integrity: sha512-pkjdQDvpJROoXLMltkP/5mZb0/XqrqLoPGKUCfbdkP8m6U9xbK40K51Wu+a4aQqTEvEK5lHBk0fWzUV72SJ3Hg==} + peerDependencies: + react: ^16.3.0 || 17 || 18 + typescript: ^4.5 + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@formatjs/ecma402-abstract': 1.11.4 + '@formatjs/icu-messageformat-parser': 2.1.0 + '@formatjs/intl': 2.2.1(typescript@4.9.5) + '@formatjs/intl-displaynames': 5.4.3 + '@formatjs/intl-listformat': 6.5.3 + '@types/hoist-non-react-statics': 3.3.5 + '@types/react': 17.0.75 + hoist-non-react-statics: 3.3.2 + intl-messageformat: 9.13.0 + react: 18.3.1 + tslib: 2.6.2 + typescript: 4.9.5 + dev: false + /react-is@16.13.1: resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==} @@ -18826,6 +19064,12 @@ packages: loose-envify: 1.4.0 object-assign: 4.1.1 + /react@18.3.1: + resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==} + engines: {node: '>=0.10.0'} + dependencies: + loose-envify: 1.4.0 + /read-pkg-up@7.0.1: resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==} engines: {node: '>=8'} @@ -19322,6 +19566,11 @@ packages: loose-envify: 1.4.0 object-assign: 4.1.1 + /scheduler@0.23.2: + resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==} + dependencies: + loose-envify: 1.4.0 + /schema-utils@2.7.1: resolution: {integrity: sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==} engines: {node: '>= 8.9.0'} @@ -19439,6 +19688,10 @@ packages: transitivePeerDependencies: - supports-color + /server-only@0.0.1: + resolution: {integrity: sha512-qepMx2JxAa5jjfzxG79yPPq+8BuFToHd1hm7kI+Z4zAq1ftQiP7HcxMhDDItrbtwVeLg/cY2JnKnrcFkmiswNA==} + dev: false + /set-blocking@2.0.0: resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} dev: true @@ -19668,6 +19921,11 @@ packages: resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} engines: {node: '>=0.10.0'} + /source-map-js@1.2.0: + resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} + engines: {node: '>=0.10.0'} + dev: false + /source-map-support@0.5.13: resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==} dependencies: @@ -20039,6 +20297,26 @@ packages: - '@babel/core' dev: false + /styled-components@6.1.13(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-M0+N2xSnAtwcVAQeFEsGWFFxXDftHUD7XrKla06QbpUMmbmtFBMMTcKWvFXtWxuD5qQkB8iU5gk6QASlx2ZRMw==} + engines: {node: '>= 16'} + peerDependencies: + react: '>= 16.8.0' + react-dom: '>= 16.8.0' + dependencies: + '@emotion/is-prop-valid': 1.2.2 + '@emotion/unitless': 0.8.1 + '@types/stylis': 4.2.5 + css-to-react-native: 3.2.0 + csstype: 3.1.3 + postcss: 8.4.38 + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + shallowequal: 1.1.0 + stylis: 4.3.2 + tslib: 2.6.2 + dev: false + /styled-jsx@5.0.7(@babel/core@7.23.7)(react@17.0.2): resolution: {integrity: sha512-b3sUzamS086YLRuvnaDigdAewz1/EFYlHpYBP5mZovKEdQQOIIYq8lApylub3HHZ6xFjV051kkGU7cudJmrXEA==} engines: {node: '>= 12.0.0'} @@ -20055,9 +20333,30 @@ packages: '@babel/core': 7.23.7 react: 17.0.2 + /styled-jsx@5.1.1(@babel/core@7.23.7)(react@18.3.1): + resolution: {integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==} + engines: {node: '>= 12.0.0'} + peerDependencies: + '@babel/core': '*' + babel-plugin-macros: '*' + react: '>= 16.8.0 || 17.x.x || ^18.0.0-0' + peerDependenciesMeta: + '@babel/core': + optional: true + babel-plugin-macros: + optional: true + dependencies: + '@babel/core': 7.23.7 + client-only: 0.0.1 + react: 18.3.1 + /stylis@4.2.0: resolution: {integrity: sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==} + /stylis@4.3.2: + resolution: {integrity: sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg==} + dev: false + /subscriptions-transport-ws@0.11.0(graphql@15.8.0): resolution: {integrity: sha512-8D4C6DIH5tGiAIpp5I0wD/xRlNiZAPGHygzCe7VzyzUoxHtawzjNAY9SUTXU05/EY2NMY9/9GF0ycizkXr1CWQ==} deprecated: The `subscriptions-transport-ws` package is no longer maintained. We recommend you use `graphql-ws` instead. For help migrating Apollo software to `graphql-ws`, see https://www.apollographql.com/docs/apollo-server/data/subscriptions/#switching-from-subscriptions-transport-ws For general help using `graphql-ws`, see https://github.com/enisdenjo/graphql-ws/blob/master/README.md @@ -20922,6 +21221,15 @@ packages: dependencies: react: 17.0.2 + /use-debounce@6.0.1(react@18.3.1): + resolution: {integrity: sha512-kpvIxpa0vOLz/2I2sfNJ72mUeaT2CMNCu5BT1f2HkV9qZK27UVSOFf1sSSu+wjJE4TcR2VTXS2SM569+m3TN7Q==} + engines: {node: '>= 10.0.0'} + peerDependencies: + react: '>=16.8.0' + dependencies: + react: 18.3.1 + dev: false + /use-sync-external-store@1.2.0(react@17.0.2): resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==} peerDependencies: From c2a806b748514d4c2a02300b8cb63135f45a2eb0 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Mon, 2 Sep 2024 10:30:24 +0200 Subject: [PATCH 31/45] Site: Switch to Next.js Preview Mode --- demo/site/src/common/blocks/DamVideoBlock.tsx | 18 +++ demo/site/src/common/blocks/HeadlineBlock.tsx | 6 +- demo/site/src/documents/pages/Page.tsx | 6 +- .../src/documents/pages/blocks/SeoBlock.tsx | 38 +++--- demo/site/src/layout/header/PageLink.tsx | 3 +- demo/site/src/pages/[[...path]].page.tsx | 129 +++++++++--------- demo/site/src/pages/_app.page.tsx | 12 +- demo/site/src/pages/api/site-preview.page.ts | 9 ++ .../[domain]/[language]/[[...path]].page.tsx | 29 ---- .../[domain]/[language]/admin/page.page.tsx | 19 --- 10 files changed, 119 insertions(+), 150 deletions(-) create mode 100644 demo/site/src/common/blocks/DamVideoBlock.tsx create mode 100644 demo/site/src/pages/api/site-preview.page.ts delete mode 100644 demo/site/src/pages/preview/[domain]/[language]/[[...path]].page.tsx delete mode 100644 demo/site/src/pages/preview/[domain]/[language]/admin/page.page.tsx diff --git a/demo/site/src/common/blocks/DamVideoBlock.tsx b/demo/site/src/common/blocks/DamVideoBlock.tsx new file mode 100644 index 00000000..aae12354 --- /dev/null +++ b/demo/site/src/common/blocks/DamVideoBlock.tsx @@ -0,0 +1,18 @@ +import { PreviewSkeleton, PropsWithData, withPreview } from "@comet/cms-site"; +import { DamVideoBlockData } from "@src/blocks.generated"; +import * as React from "react"; + +export const DamVideoBlock = withPreview( + ({ data: { damFile, autoplay, showControls } }: PropsWithData) => { + if (damFile === undefined) { + return ; + } + + return ( + + ); + }, + { label: "Video" }, +); diff --git a/demo/site/src/common/blocks/HeadlineBlock.tsx b/demo/site/src/common/blocks/HeadlineBlock.tsx index 95b6cb59..d3048a98 100644 --- a/demo/site/src/common/blocks/HeadlineBlock.tsx +++ b/demo/site/src/common/blocks/HeadlineBlock.tsx @@ -31,11 +31,7 @@ const getHeadlineRenderers = (level: HeadlineBlockData["level"]) => { export const HeadlineBlock = withPreview( ({ data: { headline, level } }: PropsWithData) => { - return ( - <> - - - ); + return ; }, { label: "Headline" }, ); diff --git a/demo/site/src/documents/pages/Page.tsx b/demo/site/src/documents/pages/Page.tsx index 7e633568..f365a8b2 100644 --- a/demo/site/src/documents/pages/Page.tsx +++ b/demo/site/src/documents/pages/Page.tsx @@ -37,11 +37,7 @@ export function Page(props: PropsWithLayout): JSX.Element { canonicalUrl={`${process.env.NEXT_PUBLIC_SITE_URL}${props.pageContent?.path}`} /> )} - {document && document.__typename === "Page" ? ( - <> -
{document.content && }
- - ) : null} + {document && document.__typename === "Page" ?
{document.content && }
: null} ); } diff --git a/demo/site/src/documents/pages/blocks/SeoBlock.tsx b/demo/site/src/documents/pages/blocks/SeoBlock.tsx index b7d2cffc..0b395246 100644 --- a/demo/site/src/documents/pages/blocks/SeoBlock.tsx +++ b/demo/site/src/documents/pages/blocks/SeoBlock.tsx @@ -14,30 +14,24 @@ export const SeoBlock: React.FunctionComponent = ({ }) => { const usedHtmlTitle = htmlTitle && htmlTitle != "" ? htmlTitle : title; return ( - <> - - {usedHtmlTitle} + + {usedHtmlTitle} - {/* Meta*/} - {metaDescription && } - + {/* Meta*/} + {metaDescription && } + - {/* Open Graph */} - {openGraphTitle && } - {openGraphDescription && } - - - {openGraphImage.block?.urlTemplate && ( - - )} + {/* Open Graph */} + {openGraphTitle && } + {openGraphDescription && } + + + {openGraphImage.block?.urlTemplate && ( + + )} - {/* No Index */} - {noIndex && ( - <> - - - )} - - + {/* No Index */} + {noIndex && } + ); }; diff --git a/demo/site/src/layout/header/PageLink.tsx b/demo/site/src/layout/header/PageLink.tsx index a39792bf..c52aa8a2 100644 --- a/demo/site/src/layout/header/PageLink.tsx +++ b/demo/site/src/layout/header/PageLink.tsx @@ -1,6 +1,7 @@ -import { Link, useRouter } from "@comet/cms-site"; import { LinkBlock } from "@src/common/blocks/LinkBlock"; import { gql } from "graphql-request"; +import Link from "next/link"; +import { useRouter } from "next/router"; import * as React from "react"; import { GQLPageLinkFragment } from "./PageLink.generated"; diff --git a/demo/site/src/pages/[[...path]].page.tsx b/demo/site/src/pages/[[...path]].page.tsx index c1cab4ae..27090d9f 100644 --- a/demo/site/src/pages/[[...path]].page.tsx +++ b/demo/site/src/pages/[[...path]].page.tsx @@ -1,20 +1,14 @@ -import { inferContentScopeFromContext } from "@src/common/contentScope/inferContentScopeFromContext"; -import { domain as configuredDomain } from "@src/config"; +import { SitePreviewParams } from "@comet/cms-site"; +import { ContentScope } from "@src/common/contentScope/ContentScope"; +import { defaultLanguage, domain as configuredDomain, domain } from "@src/config"; import { Page as PageTypePage, pageQuery as PageTypePageQuery } from "@src/documents/pages/Page"; -import { GQLPage } from "@src/graphql.generated"; +import { GQLPage, GQLPageTreeNodeScopeInput } from "@src/graphql.generated"; import { getLayout } from "@src/layout/Layout"; import NotFound404 from "@src/pages/404.page"; import { createGraphQLClient } from "@src/util/createGraphQLClient"; import { gql } from "graphql-request"; -import { - GetServerSidePropsContext, - GetServerSidePropsResult, - GetStaticPaths, - GetStaticProps, - GetStaticPropsContext, - GetStaticPropsResult, - InferGetStaticPropsType, -} from "next"; +import { GetStaticPaths, GetStaticProps, InferGetStaticPropsType } from "next"; +import { ParsedUrlQuery } from "querystring"; import * as React from "react"; import { GQLPagesQuery, GQLPagesQueryVariables, GQLPageTypeQuery, GQLPageTypeQueryVariables } from "./[[...path]].page.generated"; @@ -22,6 +16,9 @@ import { GQLPagesQuery, GQLPagesQueryVariables, GQLPageTypeQuery, GQLPageTypeQue interface PageProps { documentType: string; id: string; + pageTreeNode: { path: string; name: string }; + breadcrumbs: string[]; + scope: ContentScope; } export type PageUniversalProps = PageProps & GQLPage; @@ -36,6 +33,7 @@ export default function Page(props: InferGetStaticPropsType; } @@ -44,76 +42,68 @@ const pageTypeQuery = gql` pageTreeNodeByPath(path: $path, scope: $scope) { id documentType + parentNodes { + id + documentType + name + } } } `; -const pageTypes = { +export const pageTypes = { Page: { query: PageTypePageQuery, component: PageTypePage, }, }; -export const getStaticProps: GetStaticProps = async (context) => { - const getUniversalProps = createGetUniversalProps(); - return getUniversalProps(context); -}; +export const getStaticProps: GetStaticProps = async ( + context, +) => { + const path = context.params?.path ?? ""; + + const { scope, previewData } = context.previewData ?? { scope: { domain, language: context.locale ?? defaultLanguage }, previewData: undefined }; + + const client = createGraphQLClient({ + includeInvisiblePages: context.preview, + includeInvisibleBlocks: previewData?.includeInvisible, + previewDamUrls: context.preview, + }); + + //fetch pageType + const data = await client.request(pageTypeQuery, { + path: `/${Array.isArray(path) ? path.join("/") : path}`, + scope, + }); + if (!data.pageTreeNodeByPath?.documentType) { + // eslint-disable-next-line no-console + console.log("got no data from api", data, path); + return { notFound: true }; + } + const pageId = data.pageTreeNodeByPath.id; -interface CreateGetUniversalPropsOptions { - includeInvisibleBlocks?: boolean; - includeInvisiblePages?: boolean; - previewDamUrls?: boolean; -} + const pageType = data.pageTreeNodeByPath.documentType; + + //pageType dependent query + const { query: queryForPageType } = pageTypes[pageType]; -// a function to create a universal function which can be used as getStaticProps or getServerSideProps (preview) -export function createGetUniversalProps({ - includeInvisibleBlocks = false, - includeInvisiblePages = false, - previewDamUrls = false, -}: CreateGetUniversalPropsOptions = {}) { - return async function getUniversalProps( - context: Context, - ): Promise : GetServerSidePropsResult> { - const { params } = context; - - const client = createGraphQLClient({ includeInvisibleBlocks, includeInvisiblePages, previewDamUrls }); - const scope = inferContentScopeFromContext(context); - - const path = params?.path ?? ""; - - //fetch pageType - const data = await client.request(pageTypeQuery, { - path: `/${Array.isArray(path) ? path.join("/") : path}`, + const [layout, pageTypeData] = await Promise.all([getLayout(client, scope), client.request(queryForPageType, { pageId })]); + + return { + props: { + layout, + ...pageTypeData, + documentType: data.pageTreeNodeByPath.documentType, + id: pageId, scope, - }); - if (!data.pageTreeNodeByPath?.documentType) { - // eslint-disable-next-line no-console - console.log("got no data from api", data, path); - return { notFound: true }; - } - const pageId = data.pageTreeNodeByPath.id; - - //pageType dependent query - const { query: queryForPageType } = pageTypes[data.pageTreeNodeByPath.documentType]; - - const [layout, pageTypeData] = await Promise.all([getLayout(client, scope), client.request(queryForPageType, { pageId })]); - - return { - props: { - layout, - ...pageTypeData, - documentType: data.pageTreeNodeByPath.documentType, - id: pageId, - scope, - }, - }; + }, }; -} +}; const pagesQuery = gql` - query Pages($scope: PageTreeNodeScopeInput!) { - pageTreeNodeList(scope: $scope) { + query Pages($contentScope: PageTreeNodeScopeInput!) { + pageTreeNodeList(scope: $contentScope) { id path documentType @@ -123,10 +113,13 @@ const pagesQuery = gql` export const getStaticPaths: GetStaticPaths = async ({ locales = [] }) => { const paths: Array<{ params: { path: string[] }; locale: string }> = []; - if (process.env.NEXT_PUBLIC_SITE_IS_PREVIEW !== "true") { + if (process.env.SITE_IS_PREVIEW !== "true") { for (const locale of locales) { + if (locale === "default") { + continue; + } const data = await createGraphQLClient().request(pagesQuery, { - scope: { domain: configuredDomain, language: locale }, + contentScope: { domain: configuredDomain, language: locale }, }); paths.push( diff --git a/demo/site/src/pages/_app.page.tsx b/demo/site/src/pages/_app.page.tsx index 7eade18a..ba71b1d8 100644 --- a/demo/site/src/pages/_app.page.tsx +++ b/demo/site/src/pages/_app.page.tsx @@ -1,7 +1,9 @@ +import { SitePreviewProvider } from "@comet/cms-site"; import { ContentScope, ContentScopeProvider } from "@src/common/contentScope/ContentScope"; import { defaultLanguage, domain } from "@src/config"; import App, { AppProps, NextWebVitalsMetric } from "next/app"; import Head from "next/head"; +import { useRouter } from "next/router"; import Script from "next/script"; import * as React from "react"; import { IntlProvider } from "react-intl"; @@ -44,6 +46,8 @@ interface CustomAppProps extends AppProps { } export default function CustomApp({ Component, pageProps, scope, messages }: CustomAppProps): JSX.Element { + const router = useRouter(); + return ( // see https://github.com/vercel/next.js/tree/master/examples/with-react-intl // for a complete strategy to couple next with react-intl @@ -74,7 +78,13 @@ export default function CustomApp({ Component, pageProps, scope, messages }: Cus )} - + {router.isPreview ? ( + + + + ) : ( + + )} ); diff --git a/demo/site/src/pages/api/site-preview.page.ts b/demo/site/src/pages/api/site-preview.page.ts new file mode 100644 index 00000000..4de0cd05 --- /dev/null +++ b/demo/site/src/pages/api/site-preview.page.ts @@ -0,0 +1,9 @@ +import { legacyPagesRouterSitePreviewApiHandler } from "@comet/cms-site"; +import { createGraphQLClient } from "@src/util/createGraphQLClient"; +import { NextApiHandler } from "next"; + +const SitePreviewApiHandler: NextApiHandler = async (req, res) => { + await legacyPagesRouterSitePreviewApiHandler(req, res, createGraphQLClient()); +}; + +export default SitePreviewApiHandler; diff --git a/demo/site/src/pages/preview/[domain]/[language]/[[...path]].page.tsx b/demo/site/src/pages/preview/[domain]/[language]/[[...path]].page.tsx deleted file mode 100644 index 86752b81..00000000 --- a/demo/site/src/pages/preview/[domain]/[language]/[[...path]].page.tsx +++ /dev/null @@ -1,29 +0,0 @@ -import { parsePreviewParams, SitePreviewProvider } from "@comet/cms-site"; -import { useContentScope } from "@src/common/contentScope/ContentScope"; -import Page, { createGetUniversalProps, PageUniversalProps } from "@src/pages/[[...path]].page"; -import { GetServerSideProps, InferGetServerSidePropsType } from "next"; -import React from "react"; - -export default function AuthenticatedPreviewPage(props: InferGetServerSidePropsType): JSX.Element { - const scope = useContentScope(); - - return ( - - - - ); -} - -export const getServerSideProps: GetServerSideProps = async (context) => { - if (process.env.NODE_ENV === "production" && process.env.NEXT_PUBLIC_SITE_IS_PREVIEW !== "true") { - return { notFound: true }; - } - - const { includeInvisibleBlocks } = parsePreviewParams(context.query); - const getUniversalProps = createGetUniversalProps({ - includeInvisibleBlocks, - includeInvisiblePages: true, - previewDamUrls: true, - }); - return getUniversalProps(context); -}; diff --git a/demo/site/src/pages/preview/[domain]/[language]/admin/page.page.tsx b/demo/site/src/pages/preview/[domain]/[language]/admin/page.page.tsx deleted file mode 100644 index 94b78e90..00000000 --- a/demo/site/src/pages/preview/[domain]/[language]/admin/page.page.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import { BlockPreviewProvider, IFrameBridgeProvider, useIFrameBridge } from "@comet/cms-site"; -import { PageContentBlock } from "@src/documents/pages/blocks/PageContentBlock"; -import * as React from "react"; - -const PreviewPage: React.FunctionComponent = () => { - const iFrameBridge = useIFrameBridge(); - return
{iFrameBridge.block && }
; -}; -const IFrameBridgePreviewPage = (): JSX.Element => { - return ( - - - - - - ); -}; - -export default IFrameBridgePreviewPage; From 418d3b0f75cfe161e859a7238d52cad541af96b7 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Mon, 2 Sep 2024 10:40:42 +0200 Subject: [PATCH 32/45] Campaign: Various changes --- demo/campaign/next.config.js | 3 + demo/campaign/package.json | 16 +- .../src/common/blocks/DamImageBlock.tsx | 4 +- demo/campaign/src/common/blocks/LinkBlock.tsx | 12 +- pnpm-lock.yaml | 505 ++---------------- 5 files changed, 69 insertions(+), 471 deletions(-) diff --git a/demo/campaign/next.config.js b/demo/campaign/next.config.js index 165505ae..18c464c8 100644 --- a/demo/campaign/next.config.js +++ b/demo/campaign/next.config.js @@ -54,6 +54,9 @@ const nextConfig = { compiler: { styledComponents: true, }, + experimental: { + optimizePackageImports: ["@comet/cms-site"], + }, env: { DAM_ALLOWED_IMAGE_SIZES: cometConfig.dam.allowedImageSizes.join(","), }, diff --git a/demo/campaign/package.json b/demo/campaign/package.json index c77e25ae..c9241370 100644 --- 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": "^6.8.0", + "@comet/cms-site": "^7.2.1", "@luma-team/mjml-react": "^0.2.1", "@next/bundle-analyzer": "^12.3.4", "@opentelemetry/api": "^1.7.0", @@ -34,22 +34,22 @@ "graphql-tag": "^2.12.6", "mjml": "^4.15.3", "mjml-browser": "^4.14.1", - "mjml-react": "^2.0.8", - "next": "^12.0.0", - "react": "^17.0.0", - "react-dom": "^17.0.0", + "@faire/mjml-react": "^3.3.0", + "next": "^14.0.0", + "react": "^18.0.0", + "react-dom": "^18.0.0", "react-intl": "^5.0.0", "react-is": "^17.0.2", "redraft": "^0.10.0", "sitemap": "^6.0.0", - "styled-components": "^5.0.0", + "styled-components": "^6.0.0", "ts-node": "^10.0.0", "zod": "^3.22.4" }, "devDependencies": { "@babel/core": "^7.16.0", - "@comet/cli": "^6.8.0", - "@comet/eslint-config": "^6.8.0", + "@comet/cli": "^7.2.1", + "@comet/eslint-config": "^7.2.1", "@formatjs/cli": "^4.2.33", "@gitbeaker/node": "^35.6.0", "@graphql-codegen/add": "^3.0.0", diff --git a/demo/campaign/src/common/blocks/DamImageBlock.tsx b/demo/campaign/src/common/blocks/DamImageBlock.tsx index f08ddce1..c8dc42ae 100644 --- a/demo/campaign/src/common/blocks/DamImageBlock.tsx +++ b/demo/campaign/src/common/blocks/DamImageBlock.tsx @@ -6,7 +6,7 @@ import * as React from "react"; import { NextImageBottomPaddingFix } from "../NextImageBottomPaddingFix"; type Props = PropsWithData & - Omit & { + Omit & { aspectRatio?: string; } & ( | { layout?: "fixed" | "intrinsic" } @@ -27,7 +27,7 @@ export const DamImageBlock = withPreview( if (block.type === "pixelImage") { return ( - + ); } else if (block.type === "svgImage") { diff --git a/demo/campaign/src/common/blocks/LinkBlock.tsx b/demo/campaign/src/common/blocks/LinkBlock.tsx index 947e13d8..046a968a 100644 --- a/demo/campaign/src/common/blocks/LinkBlock.tsx +++ b/demo/campaign/src/common/blocks/LinkBlock.tsx @@ -13,9 +13,17 @@ export const LinkBlock = withPreview( } if (block.type === "internal") { - return {children}; + return ( + + {children} + + ); } else { - return {children}; + return ( + + {children} + + ); } }, { label: "Link" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b5f1ea89..8ddfaf6e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -488,11 +488,14 @@ importers: demo/campaign: dependencies: '@comet/cms-site': - specifier: ^6.8.0 - version: 6.9.0(next@12.3.4)(react-dom@17.0.2)(react@17.0.2)(styled-components@5.3.11) + specifier: ^7.2.1 + version: 7.2.1(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) + '@faire/mjml-react': + specifier: ^3.3.0 + version: 3.3.0(mjml@4.15.3)(react-dom@18.3.1)(react@18.3.1) '@luma-team/mjml-react': specifier: ^0.2.1 - version: 0.2.1(react-dom@17.0.2)(react@17.0.2) + version: 0.2.1(react-dom@18.3.1)(react@18.3.1) '@next/bundle-analyzer': specifier: ^12.3.4 version: 12.3.4 @@ -510,7 +513,7 @@ importers: version: 0.46.0(@opentelemetry/api@1.7.0) draft-js: specifier: ^0.11.7 - version: 0.11.7(react-dom@17.0.2)(react@17.0.2) + version: 0.11.7(react-dom@18.3.1)(react@18.3.1) express: specifier: ^4.0.0 version: 4.18.2 @@ -532,21 +535,18 @@ importers: mjml-browser: specifier: ^4.14.1 version: 4.15.3 - mjml-react: - specifier: ^2.0.8 - version: 2.0.8(mjml@4.15.3)(react-dom@17.0.2)(react@17.0.2) next: - specifier: ^12.0.0 - version: 12.3.4(@babel/core@7.23.7)(react-dom@17.0.2)(react@17.0.2) + specifier: ^14.0.0 + version: 14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(react-dom@18.3.1)(react@18.3.1) react: - specifier: ^17.0.0 - version: 17.0.2 + specifier: ^18.0.0 + version: 18.3.1 react-dom: - specifier: ^17.0.0 - version: 17.0.2(react@17.0.2) + specifier: ^18.0.0 + version: 18.3.1(react@18.3.1) react-intl: specifier: ^5.0.0 - version: 5.25.1(react@17.0.2)(typescript@4.9.5) + version: 5.25.1(react@18.3.1)(typescript@4.9.5) react-is: specifier: ^17.0.2 version: 17.0.2 @@ -557,8 +557,8 @@ importers: specifier: ^6.0.0 version: 6.4.0 styled-components: - specifier: ^5.0.0 - version: 5.3.11(@babel/core@7.23.7)(react-dom@17.0.2)(react-is@17.0.2)(react@17.0.2) + specifier: ^6.0.0 + version: 6.1.13(react-dom@18.3.1)(react@18.3.1) ts-node: specifier: ^10.0.0 version: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) @@ -570,11 +570,11 @@ importers: specifier: ^7.16.0 version: 7.23.7 '@comet/cli': - specifier: ^6.8.0 - version: 6.9.0 + specifier: ^7.2.1 + version: 7.2.1(ts-node@10.9.2) '@comet/eslint-config': - specifier: ^6.8.0 - version: 6.8.0(eslint@8.56.0)(next@12.3.4)(prettier@2.8.8)(typescript@4.9.5) + specifier: ^7.2.1 + version: 7.2.1(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5) '@formatjs/cli': specifier: ^4.2.33 version: 4.8.4 @@ -2135,6 +2135,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.23.6 + dev: true /@babel/helper-builder-binary-assignment-operator-visitor@7.22.15: resolution: {integrity: sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==} @@ -2251,6 +2252,7 @@ packages: /@babel/helper-plugin-utils@7.22.5: resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==} engines: {node: '>=6.9.0'} + dev: true /@babel/helper-remap-async-to-generator@7.22.20(@babel/core@7.23.7): resolution: {integrity: sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==} @@ -2606,6 +2608,7 @@ packages: dependencies: '@babel/core': 7.23.7 '@babel/helper-plugin-utils': 7.22.5 + dev: true /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.23.7): resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} @@ -3492,24 +3495,6 @@ packages: transitivePeerDependencies: - supports-color - /@babel/traverse@7.23.7(supports-color@5.5.0): - resolution: {integrity: sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/code-frame': 7.23.5 - '@babel/generator': 7.23.6 - '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-function-name': 7.23.0 - '@babel/helper-hoist-variables': 7.22.5 - '@babel/helper-split-export-declaration': 7.22.6 - '@babel/parser': 7.23.6 - '@babel/types': 7.23.6 - debug: 4.3.4(supports-color@5.5.0) - globals: 11.12.0 - transitivePeerDependencies: - - supports-color - dev: false - /@babel/types@7.23.6: resolution: {integrity: sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==} engines: {node: '>=6.9.0'} @@ -3953,14 +3938,6 @@ packages: class-validator: 0.13.2 rimraf: 3.0.2 - /@comet/cli@6.9.0: - resolution: {integrity: sha512-l3VnBjipD5Ij0fqZ2yIoPc5u659B/0VgaZTu4Vk64quvpjTn0C8gCGU/1HipGHrt8bI+e341OwbPZbem14egIg==} - hasBin: true - dependencies: - commander: 9.5.0 - prettier: 2.8.8 - dev: true - /@comet/cli@7.2.1(ts-node@10.9.2): resolution: {integrity: sha512-iAgZWyGftfvbs6+qyR0Bkq2EPbPNsHU52bKQnsLoRuF/qo6YtrxcKFu7rHvSp24/7AO9/wU3QqkG8Ab2q7ruwQ==} hasBin: true @@ -4148,27 +4125,6 @@ packages: - encoding - supports-color - /@comet/cms-site@6.9.0(next@12.3.4)(react-dom@17.0.2)(react@17.0.2)(styled-components@5.3.11): - resolution: {integrity: sha512-+RfB6ARExsytZvKkMUvobUmlfQZUCziYVpj7+4G4tRAGD1z429pwfX6IkkZ47CcwXLFrdf/hRWcezUl7s4VymA==} - peerDependencies: - next: ^12.0.0 - react: ^17.0.0 - react-dom: ^17.0.0 - styled-components: ^5.0.0 - dependencies: - jsonwebtoken: 8.5.1 - jwks-rsa: 3.1.0 - next: 12.3.4(@babel/core@7.23.7)(react-dom@17.0.2)(react@17.0.2) - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) - rimraf: 3.0.2 - scroll-into-view-if-needed: 2.2.31 - styled-components: 5.3.11(@babel/core@7.23.7)(react-dom@17.0.2)(react-is@17.0.2)(react@17.0.2) - use-debounce: 6.0.1(react@17.0.2) - transitivePeerDependencies: - - supports-color - dev: false - /@comet/cms-site@7.2.1(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13): resolution: {integrity: sha512-pLOjZmh920hOUNSDjOvXjFqivsWayO8MkqZTMvqClPwtXSfB8J0AX2XAQ8hlWWa1L33wv10Ze8bwrxmEXOMVcQ==} peerDependencies: @@ -4207,42 +4163,6 @@ packages: - debug dev: true - /@comet/eslint-config@6.8.0(eslint@8.56.0)(next@12.3.4)(prettier@2.8.8)(typescript@4.9.5): - resolution: {integrity: sha512-Spr1+2qp/EzDGrrjGlI3hXrdeqr9lXU02TTIzqkcK+CR/AhR3SDA5cCVLdJiYt8BxR1G5Y0M/wAZYePgje8TcA==} - peerDependencies: - eslint: '>= 8' - next: '*' - prettier: '>= 2' - peerDependenciesMeta: - next: - optional: true - dependencies: - '@calm/eslint-plugin-react-intl': 1.4.1 - '@comet/eslint-plugin': 6.8.0(eslint@8.56.0) - '@next/eslint-plugin-next': 12.3.4 - '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@4.9.5) - '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@4.9.5) - eslint: 8.56.0 - eslint-config-next: 13.5.6(eslint@8.56.0)(typescript@4.9.5) - eslint-config-prettier: 8.10.0(eslint@8.56.0) - eslint-plugin-formatjs: 4.12.1(eslint@8.56.0)(ts-jest@29.1.1) - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0) - eslint-plugin-json-files: 2.2.0(eslint@8.56.0) - eslint-plugin-prettier: 4.2.1(eslint-config-prettier@8.10.0)(eslint@8.56.0)(prettier@2.8.8) - eslint-plugin-react: 7.33.2(eslint@8.56.0) - eslint-plugin-react-hooks: 4.6.0(eslint@8.56.0) - eslint-plugin-simple-import-sort: 9.0.0(eslint@8.56.0) - eslint-plugin-unused-imports: 2.0.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.56.0) - next: 12.3.4(@babel/core@7.23.7)(react-dom@17.0.2)(react@17.0.2) - prettier: 2.8.8 - transitivePeerDependencies: - - eslint-import-resolver-typescript - - eslint-import-resolver-webpack - - supports-color - - ts-jest - - typescript - dev: true - /@comet/eslint-config@7.2.1(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5): resolution: {integrity: sha512-bn9wTTRcJ/Q4Zl1Rzgp1wP2SQGh2zQff+ATPUctsta89yV9odPV8fHWL8DkmrVKuLpQXm0FLvRaPNK+33f0V8Q==} peerDependencies: @@ -4355,14 +4275,6 @@ packages: - typescript dev: true - /@comet/eslint-plugin@6.8.0(eslint@8.56.0): - resolution: {integrity: sha512-g70w5dSCAlT0PpDRJRH3mV6S+efDo4v4a64UImWvy3LyV1r1PI+p+v5zHamNcsL5YFR1fPETicAsWXyzR88mmg==} - peerDependencies: - eslint: '8' - dependencies: - eslint: 8.56.0 - dev: true - /@comet/eslint-plugin@7.2.1(eslint@8.56.0): resolution: {integrity: sha512-TTNgMJSdczM03X/a7FN7fps30irkyWxgTd/dtLrUNcAqXLJFmoLsSxToNrojhIKp0Qx2cOmzAplnuFbkGWYyQg==} peerDependencies: @@ -4474,14 +4386,6 @@ packages: '@types/react': 17.0.75 react: 17.0.2 - /@emotion/stylis@0.8.5: - resolution: {integrity: sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==} - dev: false - - /@emotion/unitless@0.7.5: - resolution: {integrity: sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==} - dev: false - /@emotion/unitless@0.8.1: resolution: {integrity: sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==} @@ -4531,6 +4435,19 @@ packages: resolution: {integrity: sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@faire/mjml-react@3.3.0(mjml@4.15.3)(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-Z+PFAMEWrxn/93El9+APabz42GxC21V7Hh6phMa3pBC9Dn21TsukGXi0Gd7Rzs31Rg0o9Nzojq3UE86QZvcBFQ==} + peerDependencies: + mjml: ^4.13.0 + react: ^16.0.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0 + dependencies: + lodash.kebabcase: 4.1.1 + mjml: 4.15.3 + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + dev: false + /@faker-js/faker@8.3.1: resolution: {integrity: sha512-FdgpFxY6V6rLZE9mmIBb9hM0xpfvQOSNOLnzolzKwsE1DH+gC7lEKV1p1IbR0lAYyvYd5a4u3qWJzowUkw1bIw==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0, npm: '>=6.14.13'} @@ -6167,15 +6084,15 @@ packages: resolution: {integrity: sha512-Z7C/xXCiGWsg0KuKsHTKJxbWhpI3Vs5GwLfOean7MGyVFGqdRgBbAjOCh6u4bbjPc/8MJ2pZmK/0DLdCbivLDA==} engines: {node: '>=8'} - /@luma-team/mjml-react@0.2.1(react-dom@17.0.2)(react@17.0.2): + /@luma-team/mjml-react@0.2.1(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-Lz7LnpT2XClehWxRmy43U9/BCaSAhhKbviFosPe64C6fAycKgj56HANXWBcTQFSnbh9+Uqt8Pa15sAfZMUfjKw==} peerDependencies: react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 dependencies: color: 3.2.1 - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) dev: false /@manypkg/find-root@1.1.0: @@ -6949,54 +6866,15 @@ packages: - utf-8-validate dev: false - /@next/env@12.3.4: - resolution: {integrity: sha512-H/69Lc5Q02dq3o+dxxy5O/oNxFsZpdL6WREtOOtOM1B/weonIwDXkekr1KV5DPVPr12IHFPrMrcJQ6bgPMfn7A==} - /@next/env@14.2.7: resolution: {integrity: sha512-OTx9y6I3xE/eih+qtthppwLytmpJVPM5PPoJxChFsbjIEFXIayG0h/xLzefHGJviAa3Q5+Fd+9uYojKkHDKxoQ==} - /@next/eslint-plugin-next@12.3.4: - resolution: {integrity: sha512-BFwj8ykJY+zc1/jWANsDprDIu2MgwPOIKxNVnrKvPs+f5TPegrVnem8uScND+1veT4B7F6VeqgaNLFW1Hzl9Og==} - dependencies: - glob: 7.1.7 - dev: true - - /@next/eslint-plugin-next@13.5.6: - resolution: {integrity: sha512-ng7pU/DDsxPgT6ZPvuprxrkeew3XaRf4LAT4FabaEO/hAbvVx4P7wqnqdbTdDn1kgTvsI4tpIgT4Awn/m0bGbg==} - dependencies: - glob: 7.1.7 - dev: true - /@next/eslint-plugin-next@14.2.7: resolution: {integrity: sha512-+7xh142AdhZGjY9/L0iFo7mqRBMJHe+q+uOL+hto1Lfo9DeWCGcR6no4StlFbVSVcA6fQLKEX6y6qhMsSKbgNQ==} dependencies: glob: 10.3.10 dev: true - /@next/swc-android-arm-eabi@12.3.4: - resolution: {integrity: sha512-cM42Cw6V4Bz/2+j/xIzO8nK/Q3Ly+VSlZJTa1vHzsocJRYz8KT6MrreXaci2++SIZCF1rVRCDgAg5PpqRibdIA==} - engines: {node: '>= 10'} - cpu: [arm] - os: [android] - requiresBuild: true - optional: true - - /@next/swc-android-arm64@12.3.4: - resolution: {integrity: sha512-5jf0dTBjL+rabWjGj3eghpLUxCukRhBcEJgwLedewEA/LJk2HyqCvGIwj5rH+iwmq1llCWbOky2dO3pVljrapg==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [android] - requiresBuild: true - optional: true - - /@next/swc-darwin-arm64@12.3.4: - resolution: {integrity: sha512-DqsSTd3FRjQUR6ao0E1e2OlOcrF5br+uegcEGPVonKYJpcr0MJrtYmPxd4v5T6UCJZ+XzydF7eQo5wdGvSZAyA==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [darwin] - requiresBuild: true - optional: true - /@next/swc-darwin-arm64@14.2.7: resolution: {integrity: sha512-UhZGcOyI9LE/tZL3h9rs/2wMZaaJKwnpAyegUVDGZqwsla6hMfeSj9ssBWQS9yA4UXun3pPhrFLVnw5KXZs3vw==} engines: {node: '>= 10'} @@ -7005,14 +6883,6 @@ packages: requiresBuild: true optional: true - /@next/swc-darwin-x64@12.3.4: - resolution: {integrity: sha512-PPF7tbWD4k0dJ2EcUSnOsaOJ5rhT3rlEt/3LhZUGiYNL8KvoqczFrETlUx0cUYaXe11dRA3F80Hpt727QIwByQ==} - engines: {node: '>= 10'} - cpu: [x64] - os: [darwin] - requiresBuild: true - optional: true - /@next/swc-darwin-x64@14.2.7: resolution: {integrity: sha512-ys2cUgZYRc+CbyDeLAaAdZgS7N1Kpyy+wo0b/gAj+SeOeaj0Lw/q+G1hp+DuDiDAVyxLBCJXEY/AkhDmtihUTA==} engines: {node: '>= 10'} @@ -7021,30 +6891,6 @@ packages: requiresBuild: true optional: true - /@next/swc-freebsd-x64@12.3.4: - resolution: {integrity: sha512-KM9JXRXi/U2PUM928z7l4tnfQ9u8bTco/jb939pdFUHqc28V43Ohd31MmZD1QzEK4aFlMRaIBQOWQZh4D/E5lQ==} - engines: {node: '>= 10'} - cpu: [x64] - os: [freebsd] - requiresBuild: true - optional: true - - /@next/swc-linux-arm-gnueabihf@12.3.4: - resolution: {integrity: sha512-3zqD3pO+z5CZyxtKDTnOJ2XgFFRUBciOox6EWkoZvJfc9zcidNAQxuwonUeNts6Xbm8Wtm5YGIRC0x+12YH7kw==} - engines: {node: '>= 10'} - cpu: [arm] - os: [linux] - requiresBuild: true - optional: true - - /@next/swc-linux-arm64-gnu@12.3.4: - resolution: {integrity: sha512-kiX0vgJGMZVv+oo1QuObaYulXNvdH/IINmvdZnVzMO/jic/B8EEIGlZ8Bgvw8LCjH3zNVPO3mGrdMvnEEPEhKA==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - requiresBuild: true - optional: true - /@next/swc-linux-arm64-gnu@14.2.7: resolution: {integrity: sha512-2xoWtE13sUJ3qrC1lwE/HjbDPm+kBQYFkkiVECJWctRASAHQ+NwjMzgrfqqMYHfMxFb5Wws3w9PqzZJqKFdWcQ==} engines: {node: '>= 10'} @@ -7053,14 +6899,6 @@ packages: requiresBuild: true optional: true - /@next/swc-linux-arm64-musl@12.3.4: - resolution: {integrity: sha512-EETZPa1juczrKLWk5okoW2hv7D7WvonU+Cf2CgsSoxgsYbUCZ1voOpL4JZTOb6IbKMDo6ja+SbY0vzXZBUMvkQ==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - requiresBuild: true - optional: true - /@next/swc-linux-arm64-musl@14.2.7: resolution: {integrity: sha512-+zJ1gJdl35BSAGpkCbfyiY6iRTaPrt3KTl4SF/B1NyELkqqnrNX6cp4IjjjxKpd64/7enI0kf6b9O1Uf3cL0pw==} engines: {node: '>= 10'} @@ -7069,14 +6907,6 @@ packages: requiresBuild: true optional: true - /@next/swc-linux-x64-gnu@12.3.4: - resolution: {integrity: sha512-4csPbRbfZbuWOk3ATyWcvVFdD9/Rsdq5YHKvRuEni68OCLkfy4f+4I9OBpyK1SKJ00Cih16NJbHE+k+ljPPpag==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - requiresBuild: true - optional: true - /@next/swc-linux-x64-gnu@14.2.7: resolution: {integrity: sha512-m6EBqrskeMUzykBrv0fDX/28lWIBGhMzOYaStp0ihkjzIYJiKUOzVYD1gULHc8XDf5EMSqoH/0/TRAgXqpQwmw==} engines: {node: '>= 10'} @@ -7085,14 +6915,6 @@ packages: requiresBuild: true optional: true - /@next/swc-linux-x64-musl@12.3.4: - resolution: {integrity: sha512-YeBmI+63Ro75SUiL/QXEVXQ19T++58aI/IINOyhpsRL1LKdyfK/35iilraZEFz9bLQrwy1LYAR5lK200A9Gjbg==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - requiresBuild: true - optional: true - /@next/swc-linux-x64-musl@14.2.7: resolution: {integrity: sha512-gUu0viOMvMlzFRz1r1eQ7Ql4OE+hPOmA7smfZAhn8vC4+0swMZaZxa9CSIozTYavi+bJNDZ3tgiSdMjmMzRJlQ==} engines: {node: '>= 10'} @@ -7101,14 +6923,6 @@ packages: requiresBuild: true optional: true - /@next/swc-win32-arm64-msvc@12.3.4: - resolution: {integrity: sha512-Sd0qFUJv8Tj0PukAYbCCDbmXcMkbIuhnTeHm9m4ZGjCf6kt7E/RMs55Pd3R5ePjOkN7dJEuxYBehawTR/aPDSQ==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [win32] - requiresBuild: true - optional: true - /@next/swc-win32-arm64-msvc@14.2.7: resolution: {integrity: sha512-PGbONHIVIuzWlYmLvuFKcj+8jXnLbx4WrlESYlVnEzDsa3+Q2hI1YHoXaSmbq0k4ZwZ7J6sWNV4UZfx1OeOlbQ==} engines: {node: '>= 10'} @@ -7117,14 +6931,6 @@ packages: requiresBuild: true optional: true - /@next/swc-win32-ia32-msvc@12.3.4: - resolution: {integrity: sha512-rt/vv/vg/ZGGkrkKcuJ0LyliRdbskQU+91bje+PgoYmxTZf/tYs6IfbmgudBJk6gH3QnjHWbkphDdRQrseRefQ==} - engines: {node: '>= 10'} - cpu: [ia32] - os: [win32] - requiresBuild: true - optional: true - /@next/swc-win32-ia32-msvc@14.2.7: resolution: {integrity: sha512-BiSY5umlx9ed5RQDoHcdbuKTUkuFORDqzYKPHlLeS+STUWQKWziVOn3Ic41LuTBvqE0TRJPKpio9GSIblNR+0w==} engines: {node: '>= 10'} @@ -7133,14 +6939,6 @@ packages: requiresBuild: true optional: true - /@next/swc-win32-x64-msvc@12.3.4: - resolution: {integrity: sha512-DQ20JEfTBZAgF8QCjYfJhv2/279M6onxFjdG/+5B0Cyj00/EdBxiWb2eGGFgQhrBbNv/lsvzFbbi0Ptf8Vw/bg==} - engines: {node: '>= 10'} - cpu: [x64] - os: [win32] - requiresBuild: true - optional: true - /@next/swc-win32-x64-msvc@14.2.7: resolution: {integrity: sha512-pxsI23gKWRt/SPHFkDEsP+w+Nd7gK37Hpv0ngc5HpWy2e7cKx9zR/+Q2ptAUqICNTecAaGWvmhway7pj/JLEWA==} engines: {node: '>= 10'} @@ -8727,11 +8525,6 @@ packages: /@swc/counter@0.1.3: resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==} - /@swc/helpers@0.4.11: - resolution: {integrity: sha512-rEUrBSGIoSFuYxwBYtlUFMlE2CwGhmW+w9355/5oduSw8e5h2+Tj4UrAGNNgP9915++wj5vkQo0UuOBqOAq4nw==} - dependencies: - tslib: 2.6.2 - /@swc/helpers@0.5.5: resolution: {integrity: sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==} dependencies: @@ -9653,7 +9446,7 @@ packages: '@vue/shared': 3.4.14 estree-walker: 2.0.2 magic-string: 0.30.5 - postcss: 8.4.33 + postcss: 8.4.38 source-map-js: 1.0.2 dev: true @@ -10595,21 +10388,6 @@ packages: - supports-color dev: true - /babel-plugin-styled-components@2.1.4(@babel/core@7.23.7)(styled-components@5.3.11): - resolution: {integrity: sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g==} - peerDependencies: - styled-components: '>= 2' - dependencies: - '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-module-imports': 7.22.15 - '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.7) - lodash: 4.17.21 - picomatch: 2.3.1 - styled-components: 5.3.11(@babel/core@7.23.7)(react-dom@17.0.2)(react-is@17.0.2)(react@17.0.2) - transitivePeerDependencies: - - '@babel/core' - dev: false - /babel-plugin-syntax-trailing-function-commas@7.0.0-beta.0: resolution: {integrity: sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==} dev: true @@ -10719,13 +10497,6 @@ packages: - supports-color dev: true - /babel-runtime@6.25.0: - resolution: {integrity: sha512-zeCYxDePWYAT/DfmQWIHsMSFW2vv45UIwIAMjGvQVsTd47RwsiRH0uK1yzyWZ7LDBKdhnGDPM6NYEO5CZyhPrg==} - dependencies: - core-js: 2.6.12 - regenerator-runtime: 0.10.5 - dev: false - /backo2@1.0.2: resolution: {integrity: sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA==} @@ -11579,12 +11350,6 @@ packages: browserslist: 4.22.2 dev: true - /core-js@2.6.12: - resolution: {integrity: sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==} - deprecated: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js. - requiresBuild: true - dev: false - /core-js@3.35.0: resolution: {integrity: sha512-ntakECeqg81KqMueeGJ79Q5ZgQNR+6eaE8sxGCx62zMbAIj65q+uYvatToew3m6eAGdU4gNZwpZ34NMe4GYswg==} requiresBuild: true @@ -11900,19 +11665,6 @@ packages: dependencies: ms: 2.1.3 - /debug@4.3.4(supports-color@5.5.0): - resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: 2.1.2 - supports-color: 5.5.0 - dev: false - /debug@4.3.4(supports-color@9.4.0): resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} @@ -12574,31 +12326,6 @@ packages: source-map: 0.6.1 dev: true - /eslint-config-next@13.5.6(eslint@8.56.0)(typescript@4.9.5): - resolution: {integrity: sha512-o8pQsUHTo9aHqJ2YiZDym5gQAMRf7O2HndHo/JZeY7TDD+W4hk6Ma8Vw54RHiBeb7OWWO5dPirQB+Is/aVQ7Kg==} - peerDependencies: - eslint: ^7.23.0 || ^8.0.0 - typescript: '>=3.3.1' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@next/eslint-plugin-next': 13.5.6 - '@rushstack/eslint-patch': 1.7.0 - '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@4.9.5) - eslint: 8.56.0 - eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.56.0) - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0) - eslint-plugin-jsx-a11y: 6.8.0(eslint@8.56.0) - eslint-plugin-react: 7.33.2(eslint@8.56.0) - eslint-plugin-react-hooks: 4.6.0(eslint@8.56.0) - typescript: 4.9.5 - transitivePeerDependencies: - - eslint-import-resolver-webpack - - supports-color - dev: true - /eslint-config-next@14.2.7(eslint@8.56.0)(typescript@4.9.5): resolution: {integrity: sha512-ppmy+QdQ7qkuCHGDlPjWaoSbJvjGpWSBD4zEW8f1eWlxYXYpZK7QzBOer1EcHKT3uKhlY1JjUus9g7Kvv712rw==} peerDependencies: @@ -13814,17 +13541,6 @@ packages: path-scurry: 1.11.1 dev: false - /glob@7.1.7: - resolution: {integrity: sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==} - dependencies: - fs.realpath: 1.0.0 - inflight: 1.0.6 - inherits: 2.0.4 - minimatch: 3.1.2 - once: 1.4.0 - path-is-absolute: 1.0.1 - dev: true - /glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} dependencies: @@ -16552,6 +16268,10 @@ packages: /lodash.isundefined@3.0.1: resolution: {integrity: sha512-MXB1is3s899/cD8jheYYE2V9qTHwKvt+npCwpD+1Sxm3Q3cECXCiYHjeHWXNwr6Q0SOBPrYUDxendrO6goVTEA==} + /lodash.kebabcase@4.1.1: + resolution: {integrity: sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==} + dev: false + /lodash.memoize@4.1.2: resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==} dev: true @@ -17286,22 +17006,6 @@ packages: - encoding dev: false - /mjml-react@2.0.8(mjml@4.15.3)(react-dom@17.0.2)(react@17.0.2): - resolution: {integrity: sha512-3wtHZZs1Y7e7Tl+ImojD/+aPE8Z0xshMww7MKSQlD9A1E/92amWQilGZN3T+WjWWaDueKcH2Gc1RJ72PLGSRGA==} - peerDependencies: - mjml: ^4.7.0 - react: ^16.0.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0 - dependencies: - '@babel/runtime': 7.23.8 - babel-runtime: 6.25.0 - color: 3.2.1 - mjml: 4.15.3 - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) - react-reconciler: 0.26.2(react@17.0.2) - dev: false - /mjml-section@4.15.3: resolution: {integrity: sha512-JfVPRXH++Hd933gmQfG8JXXCBCR6fIzC3DwiYycvanL/aW1cEQ2EnebUfQkt5QzlYjOkJEH+JpccAsq3ln6FZQ==} dependencies: @@ -17505,50 +17209,6 @@ packages: commander: 8.3.0 ora: 5.4.1 - /next@12.3.4(@babel/core@7.23.7)(react-dom@17.0.2)(react@17.0.2): - resolution: {integrity: sha512-VcyMJUtLZBGzLKo3oMxrEF0stxh8HwuW976pAzlHhI3t8qJ4SROjCrSh1T24bhrbjw55wfZXAbXPGwPt5FLRfQ==} - engines: {node: '>=12.22.0'} - hasBin: true - peerDependencies: - fibers: '>= 3.1.0' - node-sass: ^6.0.0 || ^7.0.0 - react: ^17.0.2 || ^18.0.0-0 - react-dom: ^17.0.2 || ^18.0.0-0 - sass: ^1.3.0 - peerDependenciesMeta: - fibers: - optional: true - node-sass: - optional: true - sass: - optional: true - dependencies: - '@next/env': 12.3.4 - '@swc/helpers': 0.4.11 - caniuse-lite: 1.0.30001578 - postcss: 8.4.14 - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) - styled-jsx: 5.0.7(@babel/core@7.23.7)(react@17.0.2) - use-sync-external-store: 1.2.0(react@17.0.2) - optionalDependencies: - '@next/swc-android-arm-eabi': 12.3.4 - '@next/swc-android-arm64': 12.3.4 - '@next/swc-darwin-arm64': 12.3.4 - '@next/swc-darwin-x64': 12.3.4 - '@next/swc-freebsd-x64': 12.3.4 - '@next/swc-linux-arm-gnueabihf': 12.3.4 - '@next/swc-linux-arm64-gnu': 12.3.4 - '@next/swc-linux-arm64-musl': 12.3.4 - '@next/swc-linux-x64-gnu': 12.3.4 - '@next/swc-linux-x64-musl': 12.3.4 - '@next/swc-win32-arm64-msvc': 12.3.4 - '@next/swc-win32-ia32-msvc': 12.3.4 - '@next/swc-win32-x64-msvc': 12.3.4 - transitivePeerDependencies: - - '@babel/core' - - babel-plugin-macros - /next@14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-4Qy2aK0LwH4eQiSvQWyKuC7JXE13bIopEQesWE0c/P3uuNRnZCQanI0vsrMLmUQJLAto+A+/8+sve2hd+BQuOQ==} engines: {node: '>=18.17.0'} @@ -18447,21 +18107,13 @@ packages: /postcss-value-parser@4.2.0: resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} - /postcss@8.4.14: - resolution: {integrity: sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==} - engines: {node: ^10 || ^12 || >=14} - dependencies: - nanoid: 3.3.7 - picocolors: 1.0.0 - source-map-js: 1.0.2 - /postcss@8.4.31: resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==} engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.7 picocolors: 1.0.0 - source-map-js: 1.0.2 + source-map-js: 1.2.0 /postcss@8.4.33: resolution: {integrity: sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==} @@ -18479,7 +18131,6 @@ packages: nanoid: 3.3.7 picocolors: 1.0.0 source-map-js: 1.2.0 - dev: false /postgres-array@2.0.0: resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==} @@ -18972,18 +18623,6 @@ packages: prop-types: 15.8.1 react: 17.0.2 - /react-reconciler@0.26.2(react@17.0.2): - resolution: {integrity: sha512-nK6kgY28HwrMNwDnMui3dvm3rCFjZrcGiuwLc5COUipBK5hWHLOxMJhSnSomirqWwjPBJKV1QcbkI0VJr7Gl1Q==} - engines: {node: '>=0.10.0'} - peerDependencies: - react: ^17.0.2 - dependencies: - loose-envify: 1.4.0 - object-assign: 4.1.1 - react: 17.0.2 - scheduler: 0.20.2 - dev: false - /react-router-dom@5.3.4(react@17.0.2): resolution: {integrity: sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==} peerDependencies: @@ -19242,10 +18881,6 @@ packages: resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==} dev: true - /regenerator-runtime@0.10.5: - resolution: {integrity: sha512-02YopEIhAgiBHWeoTiA8aitHDt8z6w+rQqNuIftlM+ZtvSl/brTouaU7DW6GO/cHtvxJvS4Hwv2ibKdxIRi24w==} - dev: false - /regenerator-runtime@0.13.11: resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==} dev: false @@ -19920,11 +19555,11 @@ packages: /source-map-js@1.0.2: resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} engines: {node: '>=0.10.0'} + dev: true /source-map-js@1.2.0: resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} engines: {node: '>=0.10.0'} - dev: false /source-map-support@0.5.13: resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==} @@ -20272,31 +19907,6 @@ packages: webpack: 5.89.0(webpack-cli@4.10.0) dev: true - /styled-components@5.3.11(@babel/core@7.23.7)(react-dom@17.0.2)(react-is@17.0.2)(react@17.0.2): - resolution: {integrity: sha512-uuzIIfnVkagcVHv9nE0VPlHPSCmXIUGKfJ42LNjxCCTDTL5sgnJ8Z7GZBq0EnLYGln77tPpEpExt2+qa+cZqSw==} - engines: {node: '>=10'} - peerDependencies: - react: '>= 16.8.0' - react-dom: '>= 16.8.0' - react-is: '>= 16.8.0' - dependencies: - '@babel/helper-module-imports': 7.22.15 - '@babel/traverse': 7.23.7(supports-color@5.5.0) - '@emotion/is-prop-valid': 1.2.1 - '@emotion/stylis': 0.8.5 - '@emotion/unitless': 0.7.5 - babel-plugin-styled-components: 2.1.4(@babel/core@7.23.7)(styled-components@5.3.11) - css-to-react-native: 3.2.0 - hoist-non-react-statics: 3.3.2 - react: 17.0.2 - react-dom: 17.0.2(react@17.0.2) - react-is: 17.0.2 - shallowequal: 1.1.0 - supports-color: 5.5.0 - transitivePeerDependencies: - - '@babel/core' - dev: false - /styled-components@6.1.13(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-M0+N2xSnAtwcVAQeFEsGWFFxXDftHUD7XrKla06QbpUMmbmtFBMMTcKWvFXtWxuD5qQkB8iU5gk6QASlx2ZRMw==} engines: {node: '>= 16'} @@ -20317,22 +19927,6 @@ packages: tslib: 2.6.2 dev: false - /styled-jsx@5.0.7(@babel/core@7.23.7)(react@17.0.2): - resolution: {integrity: sha512-b3sUzamS086YLRuvnaDigdAewz1/EFYlHpYBP5mZovKEdQQOIIYq8lApylub3HHZ6xFjV051kkGU7cudJmrXEA==} - engines: {node: '>= 12.0.0'} - peerDependencies: - '@babel/core': '*' - babel-plugin-macros: '*' - react: '>= 16.8.0 || 17.x.x || ^18.0.0-0' - peerDependenciesMeta: - '@babel/core': - optional: true - babel-plugin-macros: - optional: true - dependencies: - '@babel/core': 7.23.7 - react: 17.0.2 - /styled-jsx@5.1.1(@babel/core@7.23.7)(react@18.3.1): resolution: {integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==} engines: {node: '>= 12.0.0'} @@ -21230,13 +20824,6 @@ packages: react: 18.3.1 dev: false - /use-sync-external-store@1.2.0(react@17.0.2): - resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - dependencies: - react: 17.0.2 - /util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} From 277d581dca1020a66ff669463cc1ecd4b7f739d1 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Mon, 2 Sep 2024 10:43:44 +0200 Subject: [PATCH 33/45] Campaign: Remove preview --- demo/campaign/src/layout/header/PageLink.tsx | 3 +- .../[domain]/[language]/index.page.tsx | 46 ------------------- 2 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 demo/campaign/src/pages/preview/[domain]/[language]/index.page.tsx diff --git a/demo/campaign/src/layout/header/PageLink.tsx b/demo/campaign/src/layout/header/PageLink.tsx index a39792bf..c52aa8a2 100644 --- a/demo/campaign/src/layout/header/PageLink.tsx +++ b/demo/campaign/src/layout/header/PageLink.tsx @@ -1,6 +1,7 @@ -import { Link, useRouter } from "@comet/cms-site"; import { LinkBlock } from "@src/common/blocks/LinkBlock"; import { gql } from "graphql-request"; +import Link from "next/link"; +import { useRouter } from "next/router"; import * as React from "react"; import { GQLPageLinkFragment } from "./PageLink.generated"; diff --git a/demo/campaign/src/pages/preview/[domain]/[language]/index.page.tsx b/demo/campaign/src/pages/preview/[domain]/[language]/index.page.tsx deleted file mode 100644 index f9368305..00000000 --- a/demo/campaign/src/pages/preview/[domain]/[language]/index.page.tsx +++ /dev/null @@ -1,46 +0,0 @@ -import { BlockPreviewProvider, IFrameBridgeProvider, useIFrameBridge } from "@comet/cms-site"; -import { generateMjmlMailContent, IntlProviderValues, RenderedMail } from "@src/components/RenderedMail"; -import { defaultLanguage } from "@src/config"; -import { getMessages } from "@src/lang"; -import { GetServerSidePropsContext } from "next"; -import * as React from "react"; - -interface Props { - intlProviderValues: IntlProviderValues; -} - -const PreviewPage: React.FC = ({ intlProviderValues }) => { - const { block } = useIFrameBridge(); - - if (!block?.content) { - return null; - } - - const mjmlContent = generateMjmlMailContent(block.content, intlProviderValues); - - return ; -}; - -const MailPreviewPage: React.FC = (props) => ( - - - - - -); - -export default MailPreviewPage; - -export async function getServerSideProps({ params }: GetServerSidePropsContext): Promise<{ props: Props } | undefined> { - const locale = typeof params?.language === "string" ? params.language : defaultLanguage; - const [messages] = await Promise.all([getMessages(locale)]); - return { - props: { - intlProviderValues: { - locale, - messages, - defaultLocale: defaultLanguage, - }, - }, - }; -} From 6e514e84f5dd30bd6ccf56ac7e17cf7bdaaf15d0 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Tue, 29 Oct 2024 09:40:12 +0100 Subject: [PATCH 34/45] Update to COMET v7.5.0 --- .changeset/fast-weeks-remember.md | 2 +- demo/admin/package.json | 16 +- demo/api/block-meta.json | 64 ++++++++ demo/api/package.json | 6 +- demo/api/schema.gql | 36 ++--- demo/campaign/package.json | 6 +- demo/site/package.json | 6 +- packages/admin/package.json | 24 +-- packages/api/package.json | 10 +- pnpm-lock.yaml | 256 +++++++++++++++--------------- 10 files changed, 245 insertions(+), 181 deletions(-) diff --git a/.changeset/fast-weeks-remember.md b/.changeset/fast-weeks-remember.md index 078deb69..412b2d8f 100644 --- 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 index 767b1e18..088f3a4d 100644 --- 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 index 3b29b12a..bcb79027 100644 --- 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 index a015536c..a1a6ca55 100644 --- 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 index 17de869c..8a1d24f1 100644 --- 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 index 506475bc..fc05611e 100644 --- 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 index 4cc95e98..f2415d0e 100644 --- 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 index a408f67f..00c173e2 100644 --- 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 index 9a861dca..cca1acfa 100644 --- 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", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b1f7a27a..ba33031d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -54,26 +54,26 @@ importers: specifier: ^7.0.0 version: 7.23.7 '@comet/admin': - specifier: ^7.2.1 - version: 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + specifier: ^7.5.0 + version: 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/admin-icons': - specifier: ^7.2.1 - version: 7.2.1(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + specifier: ^7.5.0 + version: 7.5.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) '@comet/admin-rte': - specifier: ^7.2.1 - version: 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + specifier: ^7.5.0 + version: 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/admin-theme': - specifier: ^7.2.1 - version: 7.2.1(@mui/material@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) + specifier: ^7.5.0 + version: 7.5.0(@mui/material@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@comet/blocks-admin': - specifier: ^7.2.1 - version: 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + specifier: ^7.5.0 + version: 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/brevo-admin': specifier: workspace:* version: link:../../packages/admin '@comet/cms-admin': - specifier: ^7.2.1 - version: 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd-html5-backend@16.0.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + specifier: ^7.5.0 + version: 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd-html5-backend@16.0.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@emotion/react': specifier: ^11.9.3 version: 11.11.3(@types/react@17.0.75)(react@17.0.2) @@ -160,11 +160,11 @@ importers: version: 5.3.4(react@17.0.2) devDependencies: '@comet/cli': - specifier: ^7.2.1 - version: 7.2.1(ts-node@10.9.2) + specifier: ^7.5.0 + version: 7.5.0(ts-node@10.9.2) '@comet/eslint-config': - specifier: ^7.2.1 - version: 7.2.1(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5) + specifier: ^7.5.0 + version: 7.5.0(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5) '@emotion/babel-plugin': specifier: ^11.0.0 version: 11.11.0 @@ -274,14 +274,14 @@ importers: demo/api: dependencies: '@comet/blocks-api': - specifier: ^7.2.1 - version: 7.2.1(@nestjs/common@9.4.3) + specifier: ^7.5.0 + version: 7.5.0(@nestjs/common@9.4.3) '@comet/brevo-api': specifier: workspace:* version: link:../../packages/api '@comet/cms-api': - specifier: ^7.2.1 - version: 7.2.1(@kubernetes/client-node@0.18.1)(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8)(@mikro-orm/nestjs@5.2.3)(@mikro-orm/postgresql@5.9.8)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/graphql@10.2.1)(@nestjs/platform-express@9.4.3)(express@4.18.2)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) + specifier: ^7.5.0 + version: 7.5.0(@kubernetes/client-node@0.18.1)(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8)(@mikro-orm/nestjs@5.2.3)(@mikro-orm/postgresql@5.9.8)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/graphql@10.2.1)(@nestjs/platform-express@9.4.3)(express@4.18.2)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) '@faker-js/faker': specifier: ^8.3.1 version: 8.3.1 @@ -419,8 +419,8 @@ importers: version: 5.89.0(webpack-cli@4.10.0) devDependencies: '@comet/eslint-config': - specifier: ^7.2.1 - version: 7.2.1(eslint@8.56.0)(prettier@2.8.8)(ts-jest@27.1.5)(typescript@4.9.5) + specifier: ^7.5.0 + version: 7.5.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@27.1.5)(typescript@4.9.5) '@nestjs/cli': specifier: ^9.0.0 version: 9.5.0 @@ -488,8 +488,8 @@ importers: demo/campaign: dependencies: '@comet/cms-site': - specifier: ^7.2.1 - version: 7.2.1(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) + specifier: ^7.5.0 + version: 7.5.0(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) '@faire/mjml-react': specifier: ^3.3.0 version: 3.3.0(mjml@4.15.3)(react-dom@18.3.1)(react@18.3.1) @@ -570,11 +570,11 @@ importers: specifier: ^7.16.0 version: 7.23.7 '@comet/cli': - specifier: ^7.2.1 - version: 7.2.1(ts-node@10.9.2) + specifier: ^7.5.0 + version: 7.5.0(ts-node@10.9.2) '@comet/eslint-config': - specifier: ^7.2.1 - version: 7.2.1(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5) + specifier: ^7.5.0 + version: 7.5.0(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5) '@formatjs/cli': specifier: ^4.2.33 version: 4.8.4 @@ -645,8 +645,8 @@ importers: demo/site: dependencies: '@comet/cms-site': - specifier: ^7.2.1 - version: 7.2.1(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) + specifier: ^7.5.0 + version: 7.5.0(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) '@next/bundle-analyzer': specifier: ^12.3.4 version: 12.3.4 @@ -712,11 +712,11 @@ importers: specifier: ^7.16.0 version: 7.23.7 '@comet/cli': - specifier: ^7.2.1 - version: 7.2.1(ts-node@10.9.2) + specifier: ^7.5.0 + version: 7.5.0(ts-node@10.9.2) '@comet/eslint-config': - specifier: ^7.2.1 - version: 7.2.1(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5) + specifier: ^7.5.0 + version: 7.5.0(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5) '@formatjs/cli': specifier: ^4.2.33 version: 4.8.4 @@ -809,26 +809,26 @@ importers: specifier: ^7.20.12 version: 7.23.7 '@comet/admin': - specifier: ^7.2.1 - version: 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + specifier: ^7.5.0 + version: 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/admin-babel-preset': - specifier: ^7.2.1 - version: 7.2.1(@babel/cli@7.23.4) + specifier: ^7.5.0 + version: 7.5.0(@babel/cli@7.23.4) '@comet/admin-date-time': - specifier: ^7.2.1 - version: 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + specifier: ^7.5.0 + version: 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/admin-icons': - specifier: ^7.2.1 - version: 7.2.1(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + specifier: ^7.5.0 + version: 7.5.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) '@comet/blocks-admin': - specifier: ^7.2.1 - version: 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + specifier: ^7.5.0 + version: 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/cms-admin': - specifier: ^7.2.1 - version: 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd-html5-backend@16.0.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + specifier: ^7.5.0 + version: 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd-html5-backend@16.0.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/eslint-config': - specifier: ^7.2.1 - version: 7.2.1(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5) + specifier: ^7.5.0 + version: 7.5.0(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5) '@emotion/react': specifier: ^11.9.3 version: 11.11.3(@types/react@17.0.75)(react@17.0.2) @@ -942,14 +942,14 @@ importers: version: 2.7.0 devDependencies: '@comet/blocks-api': - specifier: ^7.2.1 - version: 7.2.1(@nestjs/common@9.4.3) + specifier: ^7.5.0 + version: 7.5.0(@nestjs/common@9.4.3) '@comet/cms-api': - specifier: ^7.2.1 - version: 7.2.1(@kubernetes/client-node@0.18.1)(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8)(@mikro-orm/nestjs@5.2.3)(@mikro-orm/postgresql@5.9.8)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/graphql@10.2.1)(@nestjs/platform-express@9.4.3)(express@4.18.2)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) + specifier: ^7.5.0 + version: 7.5.0(@kubernetes/client-node@0.18.1)(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8)(@mikro-orm/nestjs@5.2.3)(@mikro-orm/postgresql@5.9.8)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/graphql@10.2.1)(@nestjs/platform-express@9.4.3)(express@4.18.2)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) '@comet/eslint-config': - specifier: ^7.2.1 - version: 7.2.1(eslint@8.56.0)(prettier@2.8.8)(ts-jest@29.1.1)(typescript@4.9.5) + specifier: ^7.5.0 + version: 7.5.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@29.1.1)(typescript@4.9.5) '@kubernetes/client-node': specifier: ^0.18.0 version: 0.18.1 @@ -1919,7 +1919,7 @@ packages: '@azure/core-auth': 1.5.0 '@azure/core-rest-pipeline': 1.16.3 '@azure/core-tracing': 1.1.2 - '@azure/core-util': 1.6.1 + '@azure/core-util': 1.9.2 tslib: 2.6.2 transitivePeerDependencies: - supports-color @@ -1941,7 +1941,7 @@ packages: engines: {node: '>=14.0.0'} dependencies: '@azure/abort-controller': 1.1.0 - '@azure/core-util': 1.6.1 + '@azure/core-util': 1.9.2 tslib: 2.6.2 /@azure/core-client@1.9.2: @@ -1952,7 +1952,7 @@ packages: '@azure/core-auth': 1.5.0 '@azure/core-rest-pipeline': 1.16.3 '@azure/core-tracing': 1.1.2 - '@azure/core-util': 1.6.1 + '@azure/core-util': 1.9.2 '@azure/logger': 1.0.4 tslib: 2.6.2 transitivePeerDependencies: @@ -1973,7 +1973,7 @@ packages: engines: {node: '>=14.0.0'} dependencies: '@azure/abort-controller': 1.1.0 - '@azure/core-util': 1.6.1 + '@azure/core-util': 1.9.2 '@azure/logger': 1.0.4 tslib: 2.6.2 @@ -2010,13 +2010,6 @@ packages: dependencies: tslib: 2.6.2 - /@azure/core-util@1.6.1: - resolution: {integrity: sha512-h5taHeySlsV9qxuK64KZxy4iln1BtMYlNt5jbuEFN3UFSAd1EwKg/Gjl5a6tZ/W8t6li3xPnutOx7zbDyXnPmQ==} - engines: {node: '>=16.0.0'} - dependencies: - '@azure/abort-controller': 1.1.0 - tslib: 2.6.2 - /@azure/core-util@1.9.2: resolution: {integrity: sha512-l1Qrqhi4x1aekkV+OlcqsJa4AnAkj5p0JV8omgwjaV9OAbP41lvrMvs+CptfetKkeEaGRGSzby7sjPZEX7+kkQ==} engines: {node: '>=18.0.0'} @@ -2028,7 +2021,7 @@ packages: resolution: {integrity: sha512-D6G7FEmDiTctPKuWegX2WTrS1enKZwqYwdKTO6ZN6JMigcCehlT0/CYl+zWpI9vQ9frwwp7GQT3/owaEXgnOsA==} engines: {node: '>=18.0.0'} dependencies: - fast-xml-parser: 4.3.3 + fast-xml-parser: 4.4.1 tslib: 2.6.2 /@azure/logger@1.0.4: @@ -2045,7 +2038,7 @@ packages: '@azure/core-auth': 1.5.0 '@azure/core-rest-pipeline': 1.16.3 '@azure/core-sse': 2.1.3 - '@azure/core-util': 1.6.1 + '@azure/core-util': 1.9.2 '@azure/logger': 1.0.4 tslib: 2.6.2 transitivePeerDependencies: @@ -2063,7 +2056,7 @@ packages: '@azure/core-paging': 1.5.0 '@azure/core-rest-pipeline': 1.16.3 '@azure/core-tracing': 1.1.2 - '@azure/core-util': 1.6.1 + '@azure/core-util': 1.9.2 '@azure/core-xml': 1.4.3 '@azure/logger': 1.0.4 events: 3.3.0 @@ -3707,8 +3700,8 @@ packages: dev: true optional: true - /@comet/admin-babel-preset@7.2.1(@babel/cli@7.23.4): - resolution: {integrity: sha512-PaTwSGZt8DybquOgqgmYGOxQGFQZEjlYSFjWShYrM3asMS++JYAv2213rEmU9a89wT2buzv7XsOLYhFrbfR7Zw==} + /@comet/admin-babel-preset@7.5.0(@babel/cli@7.23.4): + resolution: {integrity: sha512-l4eyqqlZJOt8XSVA67qFglTYlYHuok9lhuPFStKhtebFRw91p6ft5D3uWmZDcjTpsULSOW5jzOy9TfK4VsPiuA==} peerDependencies: '@babel/cli': '>= 7' dependencies: @@ -3723,8 +3716,8 @@ packages: - supports-color dev: true - /@comet/admin-date-time@7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): - resolution: {integrity: sha512-TRqp0T6l91epoSAmzLc/U9KtOJanw9LtwC0WigzFnXWDjLtUoBBqdV5tJ3uPzR/Rgc4c5F2QeKFWeo5WCGz8Pw==} + /@comet/admin-date-time@7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): + resolution: {integrity: sha512-DTtm4h1J1AaVoApJG6WpvgXesiVcSaa1eRqkaxScjc+Nav80Q0qAt7yNiAbnIJ7fl/8rmXqyXgtaWLwQondVNA==} peerDependencies: '@mui/material': ^5.0.0 react: ^17.0 @@ -3732,8 +3725,8 @@ packages: react-final-form: ^6.5.7 react-intl: ^5.0.0 || ^6.0.0 dependencies: - '@comet/admin': 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) - '@comet/admin-icons': 7.2.1(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin': 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/admin-icons': 7.5.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@mui/utils': 5.15.5(@types/react@17.0.75)(react@17.0.2) clsx: 1.2.1 @@ -3759,8 +3752,8 @@ packages: - react-router - react-router-dom - /@comet/admin-icons@7.2.1(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2): - resolution: {integrity: sha512-xUWVdkMcFv0ioDNRuHGSwxXd1JpP2tyXfH+Yo6LNSfHBssCVVk8QV8rD2VeurJO4fe16XX7IKgxkCzQRQJ7uXQ==} + /@comet/admin-icons@7.5.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2): + resolution: {integrity: sha512-X5TvVIAO8j4OCx5QimQ34zzdAdzfFo4uy2R6I5KzqvKWRUwehnnD8KL04ZgtyshV9r+hr0yshChpT1yFDwAtTQ==} peerDependencies: '@mui/material': ^5.0.0 react: ^17.0 @@ -3769,9 +3762,11 @@ packages: '@mui/material': 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) react: 17.0.2 react-dom: 17.0.2(react@17.0.2) + use-constant: 1.1.1(react@17.0.2) + uuid: 9.0.1 - /@comet/admin-rte@7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): - resolution: {integrity: sha512-95Z/DZzvjW045ZpsUaNUvw+XgG0IACVCwW+T5lWi/1vxobUwjpAitgObN6msSwNPiKSsTFwwbum0vy8jfK03RQ==} + /@comet/admin-rte@7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): + resolution: {integrity: sha512-rMlLzYYHjnHauB6Yc/T9YoiewRVwNXxn4z+nu8BdRXU8RnRjQFmCJ2Tsd2vWMTWrjLDc+oB+ZD85iCQrOAmv3Q==} peerDependencies: '@mui/material': ^5.0.0 draft-js: ^0.11.4 @@ -3781,8 +3776,8 @@ packages: react-final-form: ^6.3.1 react-intl: ^5.0.0 || ^6.0.0 dependencies: - '@comet/admin': 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) - '@comet/admin-icons': 7.2.1(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin': 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/admin-icons': 7.5.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) detect-browser: 5.3.0 draft-js: 0.11.7(react-dom@17.0.2)(react@17.0.2) @@ -3810,14 +3805,14 @@ packages: - react-router - react-router-dom - /@comet/admin-theme@7.2.1(@mui/material@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2): - resolution: {integrity: sha512-bC9a1c5AMC1ivWtvWOzXQGf2OYRUkxVZn4O34imu1SmttBRlA3Z5sN7xVOVmTpKCo4CccD2P8iSIBx8SQDFk0g==} + /@comet/admin-theme@7.5.0(@mui/material@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2): + resolution: {integrity: sha512-+Bjys0UZ6t6pTK/QxaE0BJSagVAa0lh6oGwu1wlMmuvui/TVzgE4MC40P/sebVfQO3Ceb4rQGYnu93BawNQV4w==} peerDependencies: '@mui/material': ^5.0.0 '@mui/system': ^5.0.0 react: ^17.0 dependencies: - '@comet/admin-icons': 7.2.1(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin-icons': 7.5.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@mui/system': 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react@17.0.2) '@mui/utils': 5.15.5(@types/react@17.0.75)(react@17.0.2) @@ -3826,8 +3821,8 @@ packages: - '@types/react' - react-dom - /@comet/admin@7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): - resolution: {integrity: sha512-gEXCCQvM+5BnoCWfNiUo1tcpliQgNyNJk73pg3MQ3tycjAV2FyOYL7NNeo+7bCd2gE1mqFqy9CvzlIdPPBrNLQ==} + /@comet/admin@7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): + resolution: {integrity: sha512-YTQd6NlRoLEf4YZ+4baI2k9ACo4lm6Xn244xxKSk1BGOb+QRAqQIlzgJwsxFuNfccE7vXlmgbZ3rCzpRUa/V6g==} peerDependencies: '@apollo/client': ^3.7.0 '@emotion/react': ^11.5.0 @@ -3855,8 +3850,8 @@ packages: optional: true dependencies: '@apollo/client': 3.8.9(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) - '@comet/admin-icons': 7.2.1(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) - '@comet/admin-theme': 7.2.1(@mui/material@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin-icons': 7.5.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin-theme': 7.5.0(@mui/material@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@emotion/react': 11.11.3(@types/react@17.0.75)(react@17.0.2) '@emotion/styled': 11.11.0(@emotion/react@11.11.3)(@types/react@17.0.75)(react@17.0.2) '@mui/lab': 5.0.0-alpha.161(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) @@ -3889,8 +3884,8 @@ packages: - '@mui/system' - '@types/react' - /@comet/blocks-admin@7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): - resolution: {integrity: sha512-FgWAx+H+z68RM5G1wAEGdCAREOTbXVFnDDNuFhgKr7XSdaIxubdKpxZiwuABoFKRzqprsERUHtRKH7hdAwR7xg==} + /@comet/blocks-admin@7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): + resolution: {integrity: sha512-MKMxgxdgFWyw+F3pZIBCPvmgBXgyuPWnG89rPjAjOxBhHEop0qodMl5G/npM78a84uIZEXygE7cQQnRGQLzL9Q==} peerDependencies: '@mui/material': ^5.0.0 react: ^16.8.0 || ^17.0.0 @@ -3901,8 +3896,8 @@ packages: react-router: ^5.0.0 react-router-dom: ^5.0.0 dependencies: - '@comet/admin': 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) - '@comet/admin-icons': 7.2.1(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin': 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/admin-icons': 7.5.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) '@mui/lab': 5.0.0-alpha.161(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) clipboard-copy: 4.0.1 @@ -3931,8 +3926,8 @@ packages: - graphql - history - /@comet/blocks-api@7.2.1(@nestjs/common@9.4.3): - resolution: {integrity: sha512-h/00Qs07vSaxcxBFLFXF875m7htMmbF9y5QXrCMKScjIVrivRp5+Ca1jpEDhiSagCxrmpLABYzK3gJLsSUOYew==} + /@comet/blocks-api@7.5.0(@nestjs/common@9.4.3): + resolution: {integrity: sha512-GSsCfIbSMFYTqzl9f5PGAcz+ne+C3mROlUJTUexMfhscUsr6IaHp2qU9MiMUpilKlxIQl5Ourf9wuMFHnLNeQA==} peerDependencies: '@nestjs/common': ^9.0.0 dependencies: @@ -3941,8 +3936,8 @@ packages: class-validator: 0.13.2 rimraf: 3.0.2 - /@comet/cli@7.2.1(ts-node@10.9.2): - resolution: {integrity: sha512-iAgZWyGftfvbs6+qyR0Bkq2EPbPNsHU52bKQnsLoRuF/qo6YtrxcKFu7rHvSp24/7AO9/wU3QqkG8Ab2q7ruwQ==} + /@comet/cli@7.5.0(ts-node@10.9.2): + resolution: {integrity: sha512-WH9yfs4NcjZLLKzKBFGdDiCq2wQzM1xdS+mPFu+8gfHWQcz+i/r/VNUupng8q10ePjpN/j1Wa9G0w645GkoxPg==} hasBin: true peerDependencies: ts-node: ^10.9.1 @@ -3952,8 +3947,8 @@ packages: ts-node: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) dev: true - /@comet/cms-admin@7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd-html5-backend@16.0.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): - resolution: {integrity: sha512-mfMQFQji2UKc1dtLjV7gVzpSakUgJMmeb+q9GUcaoaObXJDMktHwcx65DT71uiz1QcDBLGpJuogDkoEcjpy3CQ==} + /@comet/cms-admin@7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd-html5-backend@16.0.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): + resolution: {integrity: sha512-7XkhbcskROVlU5nuiZ/p8QNYt7VneO0NqmjSKAP3Wf/SljeAPj77Fs/qKT9QDtCkJauhIqlme2nESaWopixdpQ==} hasBin: true peerDependencies: '@apollo/client': ^3.7.0 @@ -3973,12 +3968,12 @@ packages: react-router-dom: ^5.0.0 dependencies: '@apollo/client': 3.8.9(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) - '@comet/admin': 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) - '@comet/admin-date-time': 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) - '@comet/admin-icons': 7.2.1(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) - '@comet/admin-rte': 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) - '@comet/admin-theme': 7.2.1(@mui/material@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) - '@comet/blocks-admin': 7.2.1(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/admin': 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/admin-date-time': 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/admin-icons': 7.5.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin-rte': 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/admin-theme': 7.5.0(@mui/material@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) + '@comet/blocks-admin': 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@emotion/react': 11.11.3(@types/react@17.0.75)(react@17.0.2) '@emotion/styled': 11.11.0(@emotion/react@11.11.3)(@types/react@17.0.75)(react@17.0.2) '@graphql-tools/graphql-file-loader': 7.5.17(graphql@15.8.0) @@ -4039,8 +4034,8 @@ packages: - draft-js - history - /@comet/cms-api@7.2.1(@kubernetes/client-node@0.18.1)(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8)(@mikro-orm/nestjs@5.2.3)(@mikro-orm/postgresql@5.9.8)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/graphql@10.2.1)(@nestjs/platform-express@9.4.3)(express@4.18.2)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1): - resolution: {integrity: sha512-atzg54MInYiMPOYWndFKWsnSZdP2aHCNI0kDqW8viuAaF/g9DNX6ecKFiZRzLG73iY5JZElKgpEKgbx7yf81lg==} + /@comet/cms-api@7.5.0(@kubernetes/client-node@0.18.1)(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8)(@mikro-orm/nestjs@5.2.3)(@mikro-orm/postgresql@5.9.8)(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/graphql@10.2.1)(@nestjs/platform-express@9.4.3)(express@4.18.2)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1): + resolution: {integrity: sha512-jol/BP9b98QXR8BuiIdxKKR2Cj5rHvDvV31Fo3d0N3hrUO03IQ5BW/dkAzCQtKLbv6DX9NRjWQ+CtfDOFb/Gcw==} hasBin: true peerDependencies: '@kubernetes/client-node': '>=0.18.0' @@ -4065,7 +4060,7 @@ packages: '@azure-rest/ai-translation-text': 1.0.0 '@azure/openai': 1.0.0-beta.11 '@azure/storage-blob': 12.24.0 - '@comet/blocks-api': 7.2.1(@nestjs/common@9.4.3) + '@comet/blocks-api': 7.5.0(@nestjs/common@9.4.3) '@fast-csv/parse': 4.3.6 '@golevelup/nestjs-discovery': 3.0.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) '@hapi/accept': 5.0.2 @@ -4092,7 +4087,7 @@ packages: date-fns: 2.30.0 exifr: 7.1.3 express: 4.18.2 - fast-xml-parser: 4.3.3 + fast-xml-parser: 4.4.1 file-type: 16.5.4 get-image-colors: 4.0.1 got: 11.8.6 @@ -4128,10 +4123,10 @@ packages: - encoding - supports-color - /@comet/cms-site@7.2.1(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13): - resolution: {integrity: sha512-pLOjZmh920hOUNSDjOvXjFqivsWayO8MkqZTMvqClPwtXSfB8J0AX2XAQ8hlWWa1L33wv10Ze8bwrxmEXOMVcQ==} + /@comet/cms-site@7.5.0(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13): + resolution: {integrity: sha512-IKBKIuXKVJaeI77ZMbCFOXc9Mpex9x1g3FrJdAMyy+/B7PHsvTyApDgF9LHyJ9JjfnN7lr/MQwCagzp25m5hUA==} peerDependencies: - next: '14' + next: ^14.2.0 react: ^18.0.0 react-dom: ^18.0.0 styled-components: ^6.0.0 @@ -4145,6 +4140,7 @@ packages: server-only: 0.0.1 styled-components: 6.1.13(react-dom@18.3.1)(react@18.3.1) use-debounce: 6.0.1(react@18.3.1) + usehooks-ts: 3.1.0(react@18.3.1) dev: false /@comet/dev-process-manager@2.5.1: @@ -4166,8 +4162,8 @@ packages: - debug dev: true - /@comet/eslint-config@7.2.1(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5): - resolution: {integrity: sha512-bn9wTTRcJ/Q4Zl1Rzgp1wP2SQGh2zQff+ATPUctsta89yV9odPV8fHWL8DkmrVKuLpQXm0FLvRaPNK+33f0V8Q==} + /@comet/eslint-config@7.5.0(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5): + resolution: {integrity: sha512-NEAP7IVgAjABUH0Cdv9NAlXbF9YzK+cI12Onr1vi6bDqwjVhb84S7VNl4pTlac1wAnDEuTbzTs/S6mBDQYxkyg==} peerDependencies: eslint: '>= 8' next: '*' @@ -4177,7 +4173,7 @@ packages: optional: true dependencies: '@calm/eslint-plugin-react-intl': 1.4.1 - '@comet/eslint-plugin': 7.2.1(eslint@8.56.0) + '@comet/eslint-plugin': 7.5.0(eslint@8.56.0) '@next/eslint-plugin-next': 14.2.7 '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@4.9.5) '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@4.9.5) @@ -4204,8 +4200,8 @@ packages: - typescript dev: true - /@comet/eslint-config@7.2.1(eslint@8.56.0)(prettier@2.8.8)(ts-jest@27.1.5)(typescript@4.9.5): - resolution: {integrity: sha512-bn9wTTRcJ/Q4Zl1Rzgp1wP2SQGh2zQff+ATPUctsta89yV9odPV8fHWL8DkmrVKuLpQXm0FLvRaPNK+33f0V8Q==} + /@comet/eslint-config@7.5.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@27.1.5)(typescript@4.9.5): + resolution: {integrity: sha512-NEAP7IVgAjABUH0Cdv9NAlXbF9YzK+cI12Onr1vi6bDqwjVhb84S7VNl4pTlac1wAnDEuTbzTs/S6mBDQYxkyg==} peerDependencies: eslint: '>= 8' next: '*' @@ -4215,7 +4211,7 @@ packages: optional: true dependencies: '@calm/eslint-plugin-react-intl': 1.4.1 - '@comet/eslint-plugin': 7.2.1(eslint@8.56.0) + '@comet/eslint-plugin': 7.5.0(eslint@8.56.0) '@next/eslint-plugin-next': 14.2.7 '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@4.9.5) '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@4.9.5) @@ -4241,8 +4237,8 @@ packages: - typescript dev: true - /@comet/eslint-config@7.2.1(eslint@8.56.0)(prettier@2.8.8)(ts-jest@29.1.1)(typescript@4.9.5): - resolution: {integrity: sha512-bn9wTTRcJ/Q4Zl1Rzgp1wP2SQGh2zQff+ATPUctsta89yV9odPV8fHWL8DkmrVKuLpQXm0FLvRaPNK+33f0V8Q==} + /@comet/eslint-config@7.5.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@29.1.1)(typescript@4.9.5): + resolution: {integrity: sha512-NEAP7IVgAjABUH0Cdv9NAlXbF9YzK+cI12Onr1vi6bDqwjVhb84S7VNl4pTlac1wAnDEuTbzTs/S6mBDQYxkyg==} peerDependencies: eslint: '>= 8' next: '*' @@ -4252,7 +4248,7 @@ packages: optional: true dependencies: '@calm/eslint-plugin-react-intl': 1.4.1 - '@comet/eslint-plugin': 7.2.1(eslint@8.56.0) + '@comet/eslint-plugin': 7.5.0(eslint@8.56.0) '@next/eslint-plugin-next': 14.2.7 '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@4.9.5) '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@4.9.5) @@ -4278,8 +4274,8 @@ packages: - typescript dev: true - /@comet/eslint-plugin@7.2.1(eslint@8.56.0): - resolution: {integrity: sha512-TTNgMJSdczM03X/a7FN7fps30irkyWxgTd/dtLrUNcAqXLJFmoLsSxToNrojhIKp0Qx2cOmzAplnuFbkGWYyQg==} + /@comet/eslint-plugin@7.5.0(eslint@8.56.0): + resolution: {integrity: sha512-DjlUrCyXSd9OjB9TTSLHFv7eZY8toG4AXQSlCvcl9brLnYJMm2fR+LN5h2oHeYAg6WamkXY1oN0VkZLORh91GQ==} peerDependencies: eslint: '8' dependencies: @@ -12969,12 +12965,6 @@ packages: punycode: 1.4.1 dev: true - /fast-xml-parser@4.3.3: - resolution: {integrity: sha512-coV/D1MhrShMvU6D0I+VAK3umz6hUaxxhL0yp/9RjfiYUfAv14rDhGQL+PLForhMdr0wq3PiV07WtkkNjJjNHg==} - hasBin: true - dependencies: - strnum: 1.0.5 - /fast-xml-parser@4.4.1: resolution: {integrity: sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==} hasBin: true @@ -14595,7 +14585,7 @@ packages: resolution: {integrity: sha512-v+AgVwiK5DsGtT9ng+m4mClp6zDAmwrW8nZi6Gg15qzvBnRWWdfWA1TGaXyCDnWq5g5asofIgMVl3PjKxvk1ug==} engines: {node: '>=6'} dependencies: - fast-xml-parser: 4.3.3 + fast-xml-parser: 4.4.1 /is-symbol@1.0.4: resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==} @@ -20827,6 +20817,16 @@ packages: react: 18.3.1 dev: false + /usehooks-ts@3.1.0(react@18.3.1): + resolution: {integrity: sha512-bBIa7yUyPhE1BCc0GmR96VU/15l/9gP1Ch5mYdLcFBaFGQsdmXkvjV0TtOqW1yUd6VjIwDunm+flSciCQXujiw==} + engines: {node: '>=16.15.0'} + peerDependencies: + react: ^16.8.0 || ^17 || ^18 + dependencies: + lodash.debounce: 4.0.8 + react: 18.3.1 + dev: false + /util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} From 9bce002dcf656fad122f1fd11e6ec5220ce16a81 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Wed, 30 Oct 2024 09:56:07 +0100 Subject: [PATCH 35/45] Fix API with workaround after switch to FileUploadsModule --- demo/api/schema.gql | 13 +++++++++++++ demo/api/src/app.module.ts | 2 ++ .../file-upload/file-upload-dummy.module.ts | 9 +++++++++ .../file-upload/file-upload-dummy.resolver.ts | 13 +++++++++++++ 4 files changed, 37 insertions(+) create mode 100644 demo/api/src/workaround-remove-in-future/file-upload/file-upload-dummy.module.ts create mode 100644 demo/api/src/workaround-remove-in-future/file-upload/file-upload-dummy.resolver.ts diff --git a/demo/api/schema.gql b/demo/api/schema.gql index 8a1d24f1..a4f94f8b 100644 --- a/demo/api/schema.gql +++ b/demo/api/schema.gql @@ -151,6 +151,18 @@ type FilenameResponse { isOccupied: Boolean! } +type FileUpload { + id: ID! + name: String! + size: Int! + mimetype: String! + contentHash: String! + createdAt: DateTime! + updatedAt: DateTime! + downloadUrl: String + imageUrl(resizeWidth: Int!): String +} + type User { id: String! name: String! @@ -533,6 +545,7 @@ type Query { damFolder(id: ID!): DamFolder! damFolderByNameAndParentId(scope: DamScopeInput! = {}, name: String!, parentId: ID): DamFolder mainMenu(scope: PageTreeNodeScopeInput!): [PageTreeNode!]! + dontUseFileUploadDummy: FileUpload brevoContact(id: Int!, scope: EmailCampaignContentScopeInput!): BrevoContact! brevoContacts(targetGroupId: ID, email: String, scope: EmailCampaignContentScopeInput!, offset: Int! = 0, limit: Int! = 25): PaginatedBrevoContacts! manuallyAssignedBrevoContacts(offset: Int! = 0, limit: Int! = 25, targetGroupId: ID!, email: String): PaginatedBrevoContacts! diff --git a/demo/api/src/app.module.ts b/demo/api/src/app.module.ts index cbd3e1ba..33703038 100644 --- a/demo/api/src/app.module.ts +++ b/demo/api/src/app.module.ts @@ -23,6 +23,7 @@ import { Page } from "@src/documents/pages/entities/page.entity"; import { PagesModule } from "@src/documents/pages/pages.module"; import { PageTreeNodeScope } from "@src/page-tree/dto/page-tree-node-scope"; import { PageTreeNode } from "@src/page-tree/entities/page-tree-node.entity"; +import { FileUploadDummyModule } from "@src/workaround-remove-in-future/file-upload/file-upload-dummy.module"; import { ValidationError } from "apollo-server-express"; import { Request } from "express"; @@ -179,6 +180,7 @@ export class AppModule { }), BrevoContactSubscribeModule, BrevoTransactionalMailsModule, + FileUploadDummyModule, ], }; } diff --git a/demo/api/src/workaround-remove-in-future/file-upload/file-upload-dummy.module.ts b/demo/api/src/workaround-remove-in-future/file-upload/file-upload-dummy.module.ts new file mode 100644 index 00000000..905273ed --- /dev/null +++ b/demo/api/src/workaround-remove-in-future/file-upload/file-upload-dummy.module.ts @@ -0,0 +1,9 @@ +import { Module } from "@nestjs/common"; +import { FileUploadDummyResolver } from "@src/workaround-remove-in-future/file-upload/file-upload-dummy.resolver"; + +// necessary as a workaround for https://github.com/vivid-planet/comet/pull/2677 +// can be removed once https://github.com/vivid-planet/comet/pull/2679 is released +@Module({ + providers: [FileUploadDummyResolver], +}) +export class FileUploadDummyModule {} diff --git a/demo/api/src/workaround-remove-in-future/file-upload/file-upload-dummy.resolver.ts b/demo/api/src/workaround-remove-in-future/file-upload/file-upload-dummy.resolver.ts new file mode 100644 index 00000000..822315a7 --- /dev/null +++ b/demo/api/src/workaround-remove-in-future/file-upload/file-upload-dummy.resolver.ts @@ -0,0 +1,13 @@ +import { FileUpload, RequiredPermission } from "@comet/cms-api"; +import { Query, Resolver } from "@nestjs/graphql"; + +// dummy resolver, necessary as a workaround for https://github.com/vivid-planet/comet/pull/2677 +// can be removed once https://github.com/vivid-planet/comet/pull/2679 is released +@Resolver(() => FileUpload) +@RequiredPermission(["fileUploads"], { skipScopeCheck: true }) +export class FileUploadDummyResolver { + @Query(() => FileUpload, { nullable: true }) + dontUseFileUploadDummy(): FileUpload | undefined { + return undefined; + } +} From d2d92d20a35c8792ef6f582efbb831582e97869b Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Wed, 30 Oct 2024 09:58:57 +0100 Subject: [PATCH 36/45] Update to Next 14.2 --- demo/campaign/package.json | 2 +- demo/site/package.json | 2 +- pnpm-lock.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demo/campaign/package.json b/demo/campaign/package.json index fc05611e..fc8cf75e 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -35,7 +35,7 @@ "graphql-tag": "^2.12.6", "mjml": "^4.15.3", "mjml-browser": "^4.14.1", - "next": "^14.0.0", + "next": "^14.2.0", "react": "^18.0.0", "react-dom": "^18.0.0", "react-intl": "^5.0.0", diff --git a/demo/site/package.json b/demo/site/package.json index f2415d0e..d0cbf7c4 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -37,7 +37,7 @@ "graphql": "^15.0.0", "graphql-request": "^3.0.0", "graphql-tag": "^2.12.6", - "next": "^14.0.0", + "next": "^14.2.0", "react": "^18.0.0", "react-dom": "^18.0.0", "react-intl": "^5.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ba33031d..689e322d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -536,7 +536,7 @@ importers: specifier: ^4.14.1 version: 4.15.3 next: - specifier: ^14.0.0 + specifier: ^14.2.0 version: 14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(react-dom@18.3.1)(react@18.3.1) react: specifier: ^18.0.0 @@ -681,7 +681,7 @@ importers: specifier: ^2.12.6 version: 2.12.6(graphql@15.8.0) next: - specifier: ^14.0.0 + specifier: ^14.2.0 version: 14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(react-dom@18.3.1)(react@18.3.1) react: specifier: ^18.0.0 From 28c105a39f1cc193d1d800cf8e2d0b942bd88879 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Wed, 30 Oct 2024 10:50:20 +0100 Subject: [PATCH 37/45] Fix import in API --- packages/api/src/brevo-contact/brevo-contact-import.resolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api/src/brevo-contact/brevo-contact-import.resolver.ts b/packages/api/src/brevo-contact/brevo-contact-import.resolver.ts index ce50cf78..b27a0bce 100644 --- a/packages/api/src/brevo-contact/brevo-contact-import.resolver.ts +++ b/packages/api/src/brevo-contact/brevo-contact-import.resolver.ts @@ -1,5 +1,5 @@ import { BlobStorageBackendService, FileUpload, RequiredPermission } from "@comet/cms-api"; -import { createHashedPath } from "@comet/cms-api/lib/dam/files/files.utils"; +import { createHashedPath } from "@comet/cms-api/lib/blob-storage/utils/create-hashed-path.util"; import { FileUploadsConfig } from "@comet/cms-api/lib/file-uploads/file-uploads.config"; import { FILE_UPLOADS_CONFIG } from "@comet/cms-api/lib/file-uploads/file-uploads.constants"; import { EntityManager, EntityRepository } from "@mikro-orm/core"; From 36dfddf3494387ae7b21a1cdd15994c9fc5d42bd Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Wed, 30 Oct 2024 11:05:39 +0100 Subject: [PATCH 38/45] Make sure to use the correct react version everywhere using pnpm overrides --- demo/admin/server/package-lock.json | 144 +++++++++++++---------- demo/campaign/package.json | 4 +- demo/site/package.json | 4 +- demo/site/src/layout/header/PageLink.tsx | 2 +- package.json | 24 ++++ pnpm-lock.yaml | 86 +++++++++----- 6 files changed, 166 insertions(+), 98 deletions(-) diff --git a/demo/admin/server/package-lock.json b/demo/admin/server/package-lock.json index 2af8c73f..94254598 100644 --- a/demo/admin/server/package-lock.json +++ b/demo/admin/server/package-lock.json @@ -102,9 +102,9 @@ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "node_modules/body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -114,7 +114,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -261,9 +261,9 @@ } }, "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "engines": { "node": ">= 0.6" } @@ -392,9 +392,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "engines": { "node": ">= 0.8" } @@ -550,36 +550,36 @@ } }, "node_modules/express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -610,12 +610,12 @@ ] }, "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -838,9 +838,9 @@ } }, "node_modules/helmet": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/helmet/-/helmet-7.1.0.tgz", - "integrity": "sha512-g+HZqgfbpXdCkme/Cd/mZkV0aV3BZZZSugecH03kl38m/Kmdx8jKjBikpDj2cr+Iynv4KpYEviojNdTJActJAg==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/helmet/-/helmet-7.2.0.tgz", + "integrity": "sha512-ZRiwvN089JfMXokizgqEPXsl2Guk094yExfoDXR0cBYWxtBbaSww/w+vT4WEJsBW2iTUi1GgZ6swmoug3Oy4Xw==", "engines": { "node": ">=16.0.0" } @@ -1103,9 +1103,12 @@ } }, "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/methods": { "version": "1.1.2", @@ -1127,9 +1130,9 @@ } }, "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "version": "1.53.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.53.0.tgz", + "integrity": "sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==", "engines": { "node": ">= 0.6" } @@ -1145,6 +1148,14 @@ "node": ">= 0.6" } }, + "node_modules/mime-types/node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/minimist": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", @@ -1172,9 +1183,12 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "node_modules/object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -1232,9 +1246,9 @@ } }, "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" }, "node_modules/possible-typed-array-names": { "version": "1.0.0", @@ -1257,11 +1271,11 @@ } }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -1301,14 +1315,14 @@ } }, "node_modules/regexp.prototype.flags": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", - "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz", + "integrity": "sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==", "dependencies": { - "call-bind": "^1.0.6", + "call-bind": "^1.0.7", "define-properties": "^1.2.1", "es-errors": "^1.3.0", - "set-function-name": "^2.0.1" + "set-function-name": "^2.0.2" }, "engines": { "node": ">= 0.4" @@ -1369,9 +1383,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -1391,20 +1405,28 @@ "node": ">= 0.8.0" } }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "engines": { "node": ">= 0.8.0" @@ -1650,9 +1672,9 @@ } }, "node_modules/uglify-js": { - "version": "3.17.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz", - "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==", + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", + "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", "optional": true, "bin": { "uglifyjs": "bin/uglifyjs" diff --git a/demo/campaign/package.json b/demo/campaign/package.json index fc8cf75e..cc24ca6b 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -61,8 +61,8 @@ "@types/draft-js": "^0.11.9", "@types/fs-extra": "^9.0.0", "@types/node": "^18.0.0", - "@types/react": "^17.0.0", - "@types/react-dom": "^17.0.0", + "@types/react": "^18.0.0", + "@types/react-dom": "^18.0.0", "@types/styled-components": "^5.0.0", "chokidar-cli": "^2.0.0", "dotenv-cli": "^6.0.0", diff --git a/demo/site/package.json b/demo/site/package.json index d0cbf7c4..2f03a350 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -62,8 +62,8 @@ "@types/draft-js": "^0.11.9", "@types/fs-extra": "^9.0.0", "@types/node": "^18.0.0", - "@types/react": "^17.0.0", - "@types/react-dom": "^17.0.0", + "@types/react": "^18.0.0", + "@types/react-dom": "^18.0.0", "@types/styled-components": "^5.0.0", "chokidar-cli": "^2.0.0", "dotenv-cli": "^6.0.0", diff --git a/demo/site/src/layout/header/PageLink.tsx b/demo/site/src/layout/header/PageLink.tsx index c52aa8a2..da2be939 100644 --- a/demo/site/src/layout/header/PageLink.tsx +++ b/demo/site/src/layout/header/PageLink.tsx @@ -21,7 +21,7 @@ const pageLinkFragment = gql` interface Props { page: GQLPageLinkFragment; - children: ((active: boolean) => React.ReactNode) | React.ReactNode; + children: ((active: boolean) => React.ReactElement) | React.ReactElement; } function PageLink({ page, children }: Props): JSX.Element | null { diff --git a/package.json b/package.json index 9a9d0763..c48753b0 100644 --- a/package.json +++ b/package.json @@ -38,5 +38,29 @@ "prettier": "^2.3.2", "ts-node": "^10.5.0", "typescript": "^4.2.2" + }, + "pnpm": { + "packageExtensions": { + "next@14": { + "peerDependencies": { + "@types/react": "^18.0.0" + } + }, + "@comet/cms-site@7": { + "peerDependencies": { + "@types/react": "^18.0.0" + } + }, + "styled-components": { + "peerDependencies": { + "@types/react": "^18.0.0" + } + }, + "react-intl": { + "peerDependencies": { + "@types/react": "*" + } + } + } } } \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 689e322d..f95835d8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,8 @@ settings: autoInstallPeers: false excludeLinksFromLockfile: false +packageExtensionsChecksum: dfe8f93dec5506e342bb73a0be665de6 + importers: .: @@ -151,7 +153,7 @@ importers: version: 6.5.9(final-form@4.20.10)(react@17.0.2) react-intl: specifier: ^5.10.0 - version: 5.25.1(react@17.0.2)(typescript@4.9.5) + version: 5.25.1(@types/react@17.0.75)(react@17.0.2)(typescript@4.9.5) react-router: specifier: ^5.1.2 version: 5.3.4(react@17.0.2) @@ -489,7 +491,7 @@ importers: dependencies: '@comet/cms-site': specifier: ^7.5.0 - version: 7.5.0(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) + version: 7.5.0(@types/react@18.3.12)(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) '@faire/mjml-react': specifier: ^3.3.0 version: 3.3.0(mjml@4.15.3)(react-dom@18.3.1)(react@18.3.1) @@ -537,7 +539,7 @@ importers: version: 4.15.3 next: specifier: ^14.2.0 - version: 14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(react-dom@18.3.1)(react@18.3.1) + version: 14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) react: specifier: ^18.0.0 version: 18.3.1 @@ -546,7 +548,7 @@ importers: version: 18.3.1(react@18.3.1) react-intl: specifier: ^5.0.0 - version: 5.25.1(react@18.3.1)(typescript@4.9.5) + version: 5.25.1(@types/react@18.3.12)(react@18.3.1)(typescript@4.9.5) react-is: specifier: ^17.0.2 version: 17.0.2 @@ -558,7 +560,7 @@ importers: version: 6.4.0 styled-components: specifier: ^6.0.0 - version: 6.1.13(react-dom@18.3.1)(react@18.3.1) + version: 6.1.13(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) ts-node: specifier: ^10.0.0 version: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) @@ -609,11 +611,11 @@ importers: specifier: ^18.0.0 version: 18.19.8 '@types/react': - specifier: ^17.0.0 - version: 17.0.75 + specifier: ^18.0.0 + version: 18.3.12 '@types/react-dom': - specifier: ^17.0.0 - version: 17.0.25 + specifier: ^18.0.0 + version: 18.3.1 '@types/styled-components': specifier: ^5.0.0 version: 5.1.34 @@ -646,7 +648,7 @@ importers: dependencies: '@comet/cms-site': specifier: ^7.5.0 - version: 7.5.0(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) + version: 7.5.0(@types/react@18.3.12)(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) '@next/bundle-analyzer': specifier: ^12.3.4 version: 12.3.4 @@ -682,7 +684,7 @@ importers: version: 2.12.6(graphql@15.8.0) next: specifier: ^14.2.0 - version: 14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(react-dom@18.3.1)(react@18.3.1) + version: 14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) react: specifier: ^18.0.0 version: 18.3.1 @@ -691,7 +693,7 @@ importers: version: 18.3.1(react@18.3.1) react-intl: specifier: ^5.0.0 - version: 5.25.1(react@18.3.1)(typescript@4.9.5) + version: 5.25.1(@types/react@18.3.12)(react@18.3.1)(typescript@4.9.5) react-is: specifier: ^17.0.2 version: 17.0.2 @@ -703,7 +705,7 @@ importers: version: 6.4.0 styled-components: specifier: ^6.0.0 - version: 6.1.13(react-dom@18.3.1)(react@18.3.1) + version: 6.1.13(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) ts-node: specifier: ^10.0.0 version: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) @@ -751,11 +753,11 @@ importers: specifier: ^18.0.0 version: 18.19.8 '@types/react': - specifier: ^17.0.0 - version: 17.0.75 + specifier: ^18.0.0 + version: 18.3.12 '@types/react-dom': - specifier: ^17.0.0 - version: 17.0.25 + specifier: ^18.0.0 + version: 18.3.1 '@types/styled-components': specifier: ^5.0.0 version: 5.1.34 @@ -900,7 +902,7 @@ importers: version: 6.5.9(final-form@4.20.10)(react@17.0.2) react-intl: specifier: ^5.24.6 - version: 5.25.1(react@17.0.2)(typescript@4.9.5) + version: 5.25.1(@types/react@17.0.75)(react@17.0.2)(typescript@4.9.5) react-router: specifier: ^5.1.2 version: 5.3.4(react@17.0.2) @@ -3735,7 +3737,7 @@ packages: react-date-range: 1.4.0(date-fns@2.30.0)(react@17.0.2) react-dom: 17.0.2(react@17.0.2) react-final-form: 6.5.9(final-form@4.20.10)(react@17.0.2) - react-intl: 5.25.1(react@17.0.2)(typescript@4.9.5) + react-intl: 5.25.1(@types/react@17.0.75)(react@17.0.2)(typescript@4.9.5) transitivePeerDependencies: - '@apollo/client' - '@emotion/react' @@ -3789,7 +3791,7 @@ packages: react: 17.0.2 react-dom: 17.0.2(react@17.0.2) react-final-form: 6.5.9(final-form@4.20.10)(react@17.0.2) - react-intl: 5.25.1(react@17.0.2)(typescript@4.9.5) + react-intl: 5.25.1(@types/react@17.0.75)(react@17.0.2)(typescript@4.9.5) transitivePeerDependencies: - '@apollo/client' - '@emotion/react' @@ -3875,7 +3877,7 @@ packages: react-dom: 17.0.2(react@17.0.2) react-dropzone: 14.2.3(react@17.0.2) react-final-form: 6.5.9(final-form@4.20.10)(react@17.0.2) - react-intl: 5.25.1(react@17.0.2)(typescript@4.9.5) + react-intl: 5.25.1(@types/react@17.0.75)(react@17.0.2)(typescript@4.9.5) react-router: 5.3.4(react@17.0.2) react-router-dom: 5.3.4(react@17.0.2) use-constant: 1.1.1(react@17.0.2) @@ -3907,7 +3909,7 @@ packages: react-dnd: 16.0.1(@types/node@18.19.8)(@types/react@17.0.75)(react@17.0.2) react-dom: 17.0.2(react@17.0.2) react-final-form: 6.5.9(final-form@4.20.10)(react@17.0.2) - react-intl: 5.25.1(react@17.0.2)(typescript@4.9.5) + react-intl: 5.25.1(@types/react@17.0.75)(react@17.0.2)(typescript@4.9.5) react-router: 5.3.4(react@17.0.2) react-router-dom: 5.3.4(react@17.0.2) rimraf: 3.0.2 @@ -4014,7 +4016,7 @@ packages: react-final-form-arrays: 3.1.4(final-form-arrays@3.1.0)(final-form@4.20.10)(react-final-form@6.5.9)(react@17.0.2) react-hotkeys-hook: 3.4.7(react-dom@17.0.2)(react@17.0.2) react-image-crop: 8.6.12(react@17.0.2) - react-intl: 5.25.1(react@17.0.2)(typescript@4.9.5) + react-intl: 5.25.1(@types/react@17.0.75)(react@17.0.2)(typescript@4.9.5) react-router: 5.3.4(react@17.0.2) react-router-dom: 5.3.4(react@17.0.2) react-split: 2.0.14(react@17.0.2) @@ -4123,22 +4125,24 @@ packages: - encoding - supports-color - /@comet/cms-site@7.5.0(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13): + /@comet/cms-site@7.5.0(@types/react@18.3.12)(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13): resolution: {integrity: sha512-IKBKIuXKVJaeI77ZMbCFOXc9Mpex9x1g3FrJdAMyy+/B7PHsvTyApDgF9LHyJ9JjfnN7lr/MQwCagzp25m5hUA==} peerDependencies: + '@types/react': ^18.0.0 next: ^14.2.0 react: ^18.0.0 react-dom: ^18.0.0 styled-components: ^6.0.0 dependencies: + '@types/react': 18.3.12 jose: 5.8.0 - next: 14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(react-dom@18.3.1)(react@18.3.1) + next: 14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) rimraf: 3.0.2 scroll-into-view-if-needed: 2.2.31 server-only: 0.0.1 - styled-components: 6.1.13(react-dom@18.3.1)(react@18.3.1) + styled-components: 6.1.13(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) use-debounce: 6.0.1(react@18.3.1) usehooks-ts: 3.1.0(react@18.3.1) dev: false @@ -4189,7 +4193,7 @@ packages: eslint-plugin-react-hooks: 4.6.0(eslint@8.56.0) eslint-plugin-simple-import-sort: 9.0.0(eslint@8.56.0) eslint-plugin-unused-imports: 2.0.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.56.0) - next: 14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(react-dom@18.3.1)(react@18.3.1) + next: 14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) npm-run-all: 4.1.5 prettier: 2.8.8 transitivePeerDependencies: @@ -9079,6 +9083,12 @@ packages: '@types/react': 17.0.75 dev: true + /@types/react-dom@18.3.1: + resolution: {integrity: sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==} + dependencies: + '@types/react': 17.0.75 + dev: true + /@types/react-router-dom@5.3.3: resolution: {integrity: sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==} dependencies: @@ -9106,6 +9116,12 @@ packages: '@types/scheduler': 0.16.8 csstype: 3.1.3 + /@types/react@18.3.12: + resolution: {integrity: sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==} + dependencies: + '@types/prop-types': 15.7.11 + csstype: 3.1.3 + /@types/request@2.48.12: resolution: {integrity: sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw==} dependencies: @@ -17202,13 +17218,14 @@ packages: commander: 8.3.0 ora: 5.4.1 - /next@14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(react-dom@18.3.1)(react@18.3.1): + /next@14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-4Qy2aK0LwH4eQiSvQWyKuC7JXE13bIopEQesWE0c/P3uuNRnZCQanI0vsrMLmUQJLAto+A+/8+sve2hd+BQuOQ==} engines: {node: '>=18.17.0'} hasBin: true peerDependencies: '@opentelemetry/api': ^1.1.0 '@playwright/test': ^1.41.2 + '@types/react': ^18.0.0 react: ^18.2.0 react-dom: ^18.2.0 sass: ^1.3.0 @@ -17223,6 +17240,7 @@ packages: '@next/env': 14.2.7 '@opentelemetry/api': 1.7.0 '@swc/helpers': 0.5.5 + '@types/react': 18.3.12 busboy: 1.6.0 caniuse-lite: 1.0.30001655 graceful-fs: 4.2.11 @@ -18554,9 +18572,10 @@ packages: prop-types: 15.8.1 react: 17.0.2 - /react-intl@5.25.1(react@17.0.2)(typescript@4.9.5): + /react-intl@5.25.1(@types/react@17.0.75)(react@17.0.2)(typescript@4.9.5): resolution: {integrity: sha512-pkjdQDvpJROoXLMltkP/5mZb0/XqrqLoPGKUCfbdkP8m6U9xbK40K51Wu+a4aQqTEvEK5lHBk0fWzUV72SJ3Hg==} peerDependencies: + '@types/react': '*' react: ^16.3.0 || 17 || 18 typescript: ^4.5 peerDependenciesMeta: @@ -18576,9 +18595,10 @@ packages: tslib: 2.6.2 typescript: 4.9.5 - /react-intl@5.25.1(react@18.3.1)(typescript@4.9.5): + /react-intl@5.25.1(@types/react@18.3.12)(react@18.3.1)(typescript@4.9.5): resolution: {integrity: sha512-pkjdQDvpJROoXLMltkP/5mZb0/XqrqLoPGKUCfbdkP8m6U9xbK40K51Wu+a4aQqTEvEK5lHBk0fWzUV72SJ3Hg==} peerDependencies: + '@types/react': '*' react: ^16.3.0 || 17 || 18 typescript: ^4.5 peerDependenciesMeta: @@ -18591,7 +18611,7 @@ packages: '@formatjs/intl-displaynames': 5.4.3 '@formatjs/intl-listformat': 6.5.3 '@types/hoist-non-react-statics': 3.3.5 - '@types/react': 17.0.75 + '@types/react': 18.3.12 hoist-non-react-statics: 3.3.2 intl-messageformat: 9.13.0 react: 18.3.1 @@ -19900,15 +19920,17 @@ packages: webpack: 5.89.0(webpack-cli@4.10.0) dev: true - /styled-components@6.1.13(react-dom@18.3.1)(react@18.3.1): + /styled-components@6.1.13(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-M0+N2xSnAtwcVAQeFEsGWFFxXDftHUD7XrKla06QbpUMmbmtFBMMTcKWvFXtWxuD5qQkB8iU5gk6QASlx2ZRMw==} engines: {node: '>= 16'} peerDependencies: + '@types/react': ^18.0.0 react: '>= 16.8.0' react-dom: '>= 16.8.0' dependencies: '@emotion/is-prop-valid': 1.2.2 '@emotion/unitless': 0.8.1 + '@types/react': 18.3.12 '@types/stylis': 4.2.5 css-to-react-native: 3.2.0 csstype: 3.1.3 From d1b86c07e5e0ae4cd732d649cc0522a1ab68b85a Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Wed, 30 Oct 2024 11:07:46 +0100 Subject: [PATCH 39/45] Fix PageLink type in campaign --- demo/campaign/src/layout/header/PageLink.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/campaign/src/layout/header/PageLink.tsx b/demo/campaign/src/layout/header/PageLink.tsx index c52aa8a2..da2be939 100644 --- a/demo/campaign/src/layout/header/PageLink.tsx +++ b/demo/campaign/src/layout/header/PageLink.tsx @@ -21,7 +21,7 @@ const pageLinkFragment = gql` interface Props { page: GQLPageLinkFragment; - children: ((active: boolean) => React.ReactNode) | React.ReactNode; + children: ((active: boolean) => React.ReactElement) | React.ReactElement; } function PageLink({ page, children }: Props): JSX.Element | null { From da548d1515c430ebc1e6e8b9297201370d5cf0c6 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Wed, 30 Oct 2024 11:20:37 +0100 Subject: [PATCH 40/45] Fix typing issue with mjml --- demo/campaign/package.json | 2 +- package.json | 5 +++++ pnpm-lock.yaml | 12 +++++++----- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/demo/campaign/package.json b/demo/campaign/package.json index cc24ca6b..48f8eb13 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@comet/cms-site": "^7.5.0", - "@faire/mjml-react": "^3.3.0", + "@faire/mjml-react": "^3.4.0", "@luma-team/mjml-react": "^0.2.1", "@next/bundle-analyzer": "^12.3.4", "@opentelemetry/api": "^1.7.0", diff --git a/package.json b/package.json index c48753b0..7bab62e8 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,11 @@ "@types/react": "^18.0.0" } }, + "@faire/mjml-react@3": { + "peerDependencies": { + "@types/react": "^18.0.0" + } + }, "styled-components": { "peerDependencies": { "@types/react": "^18.0.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f95835d8..dfc2b426 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,7 +4,7 @@ settings: autoInstallPeers: false excludeLinksFromLockfile: false -packageExtensionsChecksum: dfe8f93dec5506e342bb73a0be665de6 +packageExtensionsChecksum: 8b8792973f669aa2277355fb90c68ff0 importers: @@ -493,8 +493,8 @@ importers: specifier: ^7.5.0 version: 7.5.0(@types/react@18.3.12)(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) '@faire/mjml-react': - specifier: ^3.3.0 - version: 3.3.0(mjml@4.15.3)(react-dom@18.3.1)(react@18.3.1) + specifier: ^3.4.0 + version: 3.4.0(@types/react@18.3.12)(mjml@4.15.3)(react-dom@18.3.1)(react@18.3.1) '@luma-team/mjml-react': specifier: ^0.2.1 version: 0.2.1(react-dom@18.3.1)(react@18.3.1) @@ -4438,13 +4438,15 @@ packages: resolution: {integrity: sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - /@faire/mjml-react@3.3.0(mjml@4.15.3)(react-dom@18.3.1)(react@18.3.1): - resolution: {integrity: sha512-Z+PFAMEWrxn/93El9+APabz42GxC21V7Hh6phMa3pBC9Dn21TsukGXi0Gd7Rzs31Rg0o9Nzojq3UE86QZvcBFQ==} + /@faire/mjml-react@3.4.0(@types/react@18.3.12)(mjml@4.15.3)(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-0rfn/ZmF5ve0MV7jq3SjIKlxRhRIVxatzZGURPWKfZTMK4ShStlrzbUSF6mUCF9yAcsTxJdAZlvMz+IkpGWp3Q==} peerDependencies: + '@types/react': ^18.0.0 mjml: ^4.13.0 react: ^16.0.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0 dependencies: + '@types/react': 18.3.12 lodash.kebabcase: 4.1.1 mjml: 4.15.3 react: 18.3.1 From 56ccf4336994309c92386bdbeb4e3cc1dc8e719b Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Wed, 30 Oct 2024 12:35:15 +0100 Subject: [PATCH 41/45] Fix block preview for site --- demo/admin/src/App.tsx | 2 ++ demo/admin/src/documents/pages/EditPage.tsx | 6 +++++- .../pages/block-preview/page/content.page.tsx | 19 +++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 demo/site/src/pages/block-preview/page/content.page.tsx diff --git a/demo/admin/src/App.tsx b/demo/admin/src/App.tsx index 464c3f2b..2394fd3f 100644 --- a/demo/admin/src/App.tsx +++ b/demo/admin/src/App.tsx @@ -65,6 +65,8 @@ export function App() { return { ...siteConfig, previewUrl: `${siteConfig.blockPreviewBaseUrl}/${scope.language}`, + blockPreviewBaseUrl: `${siteConfig.url}/block-preview`, + sitePreviewApiUrl: `${siteConfig.url}/api/site-preview`, }; }, }} diff --git a/demo/admin/src/documents/pages/EditPage.tsx b/demo/admin/src/documents/pages/EditPage.tsx index edd63beb..1a82cb7f 100644 --- a/demo/admin/src/documents/pages/EditPage.tsx +++ b/demo/admin/src/documents/pages/EditPage.tsx @@ -142,7 +142,11 @@ export const EditPage: React.FC = ({ id, category }) => { - + {[ { key: "content", diff --git a/demo/site/src/pages/block-preview/page/content.page.tsx b/demo/site/src/pages/block-preview/page/content.page.tsx new file mode 100644 index 00000000..94b78e90 --- /dev/null +++ b/demo/site/src/pages/block-preview/page/content.page.tsx @@ -0,0 +1,19 @@ +import { BlockPreviewProvider, IFrameBridgeProvider, useIFrameBridge } from "@comet/cms-site"; +import { PageContentBlock } from "@src/documents/pages/blocks/PageContentBlock"; +import * as React from "react"; + +const PreviewPage: React.FunctionComponent = () => { + const iFrameBridge = useIFrameBridge(); + return
{iFrameBridge.block && }
; +}; +const IFrameBridgePreviewPage = (): JSX.Element => { + return ( + + + + + + ); +}; + +export default IFrameBridgePreviewPage; From 6ddef113f337d5e4ebc7c4d40bba7d2a940a99e2 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Wed, 30 Oct 2024 13:05:42 +0100 Subject: [PATCH 42/45] Fix block preview for campaign --- demo/admin/src/App.tsx | 2 +- .../[domain]/[language]/index.page.tsx | 46 +++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 demo/campaign/src/pages/block-preview/[domain]/[language]/index.page.tsx diff --git a/demo/admin/src/App.tsx b/demo/admin/src/App.tsx index 2394fd3f..5d4d66b8 100644 --- a/demo/admin/src/App.tsx +++ b/demo/admin/src/App.tsx @@ -82,7 +82,7 @@ export function App() { value={{ apiUrl: config.apiUrl, resolvePreviewUrlForScope: (scope: ContentScope) => { - return `${config.campaignUrl}/preview/${scope.domain}/${scope.language}`; + return `${config.campaignUrl}/block-preview/${scope.domain}/${scope.language}`; }, }} > diff --git a/demo/campaign/src/pages/block-preview/[domain]/[language]/index.page.tsx b/demo/campaign/src/pages/block-preview/[domain]/[language]/index.page.tsx new file mode 100644 index 00000000..f9368305 --- /dev/null +++ b/demo/campaign/src/pages/block-preview/[domain]/[language]/index.page.tsx @@ -0,0 +1,46 @@ +import { BlockPreviewProvider, IFrameBridgeProvider, useIFrameBridge } from "@comet/cms-site"; +import { generateMjmlMailContent, IntlProviderValues, RenderedMail } from "@src/components/RenderedMail"; +import { defaultLanguage } from "@src/config"; +import { getMessages } from "@src/lang"; +import { GetServerSidePropsContext } from "next"; +import * as React from "react"; + +interface Props { + intlProviderValues: IntlProviderValues; +} + +const PreviewPage: React.FC = ({ intlProviderValues }) => { + const { block } = useIFrameBridge(); + + if (!block?.content) { + return null; + } + + const mjmlContent = generateMjmlMailContent(block.content, intlProviderValues); + + return ; +}; + +const MailPreviewPage: React.FC = (props) => ( + + + + + +); + +export default MailPreviewPage; + +export async function getServerSideProps({ params }: GetServerSidePropsContext): Promise<{ props: Props } | undefined> { + const locale = typeof params?.language === "string" ? params.language : defaultLanguage; + const [messages] = await Promise.all([getMessages(locale)]); + return { + props: { + intlProviderValues: { + locale, + messages, + defaultLocale: defaultLanguage, + }, + }, + }; +} From 8de112e80916882a38fd7567a5a6f805662e33d0 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Thu, 31 Oct 2024 10:52:49 +0100 Subject: [PATCH 43/45] Update Apollo client to fix cache error --- demo/admin/package.json | 2 +- packages/admin/package.json | 2 +- pnpm-lock.yaml | 1364 ++++++++++++++++++----------------- 3 files changed, 718 insertions(+), 650 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 088f3a4d..7969f0fb 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -23,7 +23,7 @@ "generate-block-types:watch": "chokidar -s \"**/block-meta.json\" -c \"npm run generate-block-types\"" }, "dependencies": { - "@apollo/client": "^3.2.5", + "@apollo/client": "^3.11.8", "@babel/core": "^7.0.0", "@comet/admin": "^7.5.0", "@comet/admin-icons": "^7.5.0", diff --git a/packages/admin/package.json b/packages/admin/package.json index 00c173e2..09d69af0 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -34,7 +34,7 @@ "react-dropzone": "^14.2.3" }, "devDependencies": { - "@apollo/client": "^3.2.5", + "@apollo/client": "^3.11.8", "@babel/cli": "^7.17.6", "@babel/core": "^7.20.12", "@comet/admin": "^7.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dfc2b426..68f6d5ca 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -50,32 +50,32 @@ importers: demo/admin: dependencies: '@apollo/client': - specifier: ^3.2.5 - version: 3.8.9(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) + specifier: ^3.11.8 + version: 3.11.8(@types/react@17.0.75)(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) '@babel/core': specifier: ^7.0.0 version: 7.23.7 '@comet/admin': specifier: ^7.5.0 - version: 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + version: 7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/admin-icons': specifier: ^7.5.0 version: 7.5.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) '@comet/admin-rte': specifier: ^7.5.0 - version: 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + version: 7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/admin-theme': specifier: ^7.5.0 version: 7.5.0(@mui/material@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@comet/blocks-admin': specifier: ^7.5.0 - version: 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + version: 7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/brevo-admin': specifier: workspace:* version: link:../../packages/admin '@comet/cms-admin': specifier: ^7.5.0 - version: 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd-html5-backend@16.0.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + version: 7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd-html5-backend@16.0.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@emotion/react': specifier: ^11.9.3 version: 11.11.3(@types/react@17.0.75)(react@17.0.2) @@ -84,7 +84,7 @@ importers: version: 11.11.0(@emotion/react@11.11.3)(@types/react@17.0.75)(react@17.0.2) '@fontsource-variable/roboto-flex': specifier: ^5.0.14 - version: 5.0.16 + version: 5.1.0 '@mui/icons-material': specifier: ^5.8.4 version: 5.14.5(@mui/material@5.15.5)(@types/react@17.0.75)(react@17.0.2) @@ -166,7 +166,7 @@ importers: version: 7.5.0(ts-node@10.9.2) '@comet/eslint-config': specifier: ^7.5.0 - version: 7.5.0(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5) + version: 7.5.0(eslint@8.56.0)(next@14.2.16)(prettier@2.8.8)(typescript@4.9.5) '@emotion/babel-plugin': specifier: ^11.0.0 version: 11.11.0 @@ -491,7 +491,7 @@ importers: dependencies: '@comet/cms-site': specifier: ^7.5.0 - version: 7.5.0(@types/react@18.3.12)(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) + version: 7.5.0(@types/react@18.3.12)(next@14.2.16)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) '@faire/mjml-react': specifier: ^3.4.0 version: 3.4.0(@types/react@18.3.12)(mjml@4.15.3)(react-dom@18.3.1)(react@18.3.1) @@ -539,7 +539,7 @@ importers: version: 4.15.3 next: specifier: ^14.2.0 - version: 14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) + version: 14.2.16(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) react: specifier: ^18.0.0 version: 18.3.1 @@ -576,7 +576,7 @@ importers: version: 7.5.0(ts-node@10.9.2) '@comet/eslint-config': specifier: ^7.5.0 - version: 7.5.0(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5) + version: 7.5.0(eslint@8.56.0)(next@14.2.16)(prettier@2.8.8)(typescript@4.9.5) '@formatjs/cli': specifier: ^4.2.33 version: 4.8.4 @@ -648,7 +648,7 @@ importers: dependencies: '@comet/cms-site': specifier: ^7.5.0 - version: 7.5.0(@types/react@18.3.12)(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) + version: 7.5.0(@types/react@18.3.12)(next@14.2.16)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) '@next/bundle-analyzer': specifier: ^12.3.4 version: 12.3.4 @@ -684,7 +684,7 @@ importers: version: 2.12.6(graphql@15.8.0) next: specifier: ^14.2.0 - version: 14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) + version: 14.2.16(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) react: specifier: ^18.0.0 version: 18.3.1 @@ -718,7 +718,7 @@ importers: version: 7.5.0(ts-node@10.9.2) '@comet/eslint-config': specifier: ^7.5.0 - version: 7.5.0(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5) + version: 7.5.0(eslint@8.56.0)(next@14.2.16)(prettier@2.8.8)(typescript@4.9.5) '@formatjs/cli': specifier: ^4.2.33 version: 4.8.4 @@ -802,8 +802,8 @@ importers: version: 14.2.3(react@17.0.2) devDependencies: '@apollo/client': - specifier: ^3.2.5 - version: 3.8.9(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) + specifier: ^3.11.8 + version: 3.11.8(@types/react@17.0.75)(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) '@babel/cli': specifier: ^7.17.6 version: 7.23.4(@babel/core@7.23.7) @@ -812,25 +812,25 @@ importers: version: 7.23.7 '@comet/admin': specifier: ^7.5.0 - version: 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + version: 7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/admin-babel-preset': specifier: ^7.5.0 version: 7.5.0(@babel/cli@7.23.4) '@comet/admin-date-time': specifier: ^7.5.0 - version: 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + version: 7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/admin-icons': specifier: ^7.5.0 version: 7.5.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) '@comet/blocks-admin': specifier: ^7.5.0 - version: 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + version: 7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/cms-admin': specifier: ^7.5.0 - version: 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd-html5-backend@16.0.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + version: 7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd-html5-backend@16.0.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/eslint-config': specifier: ^7.5.0 - version: 7.5.0(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5) + version: 7.5.0(eslint@8.56.0)(next@14.2.16)(prettier@2.8.8)(typescript@4.9.5) '@emotion/react': specifier: ^11.9.3 version: 11.11.3(@types/react@17.0.75)(react@17.0.2) @@ -1113,13 +1113,13 @@ packages: - chokidar dev: true - /@apollo/client@3.8.9(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2): - resolution: {integrity: sha512-IcQDFEEPc9+PEQsxhxQvsoQ04BRarOzi/Ila5PcniRSDeKJWgY22dnp6+V1i1fWXRDVd1ybdvze4sFESDVQUCQ==} + /@apollo/client@3.11.8(@types/react@17.0.75)(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2): + resolution: {integrity: sha512-CgG1wbtMjsV2pRGe/eYITmV5B8lXUCYljB2gB/6jWTFQcrvirUVvKg7qtFdjYkQSFbIffU1IDyxgeaN81eTjbA==} peerDependencies: - graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 + graphql: ^15.0.0 || ^16.0.0 graphql-ws: ^5.5.5 - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 + react: ^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc <19.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc <19.0.0 subscriptions-transport-ws: ^0.9.0 || ^0.11.0 peerDependenciesMeta: graphql-ws: @@ -1132,6 +1132,7 @@ packages: optional: true dependencies: '@graphql-typed-document-node/core': 3.2.0(graphql@15.8.0) + '@wry/caches': 1.0.1 '@wry/equality': 0.5.7 '@wry/trie': 0.5.0 graphql: 15.8.0 @@ -1141,11 +1142,14 @@ packages: prop-types: 15.8.1 react: 17.0.2 react-dom: 17.0.2(react@17.0.2) + rehackt: 0.1.0(@types/react@17.0.75)(react@17.0.2) response-iterator: 0.2.6 symbol-observable: 4.0.0 ts-invariant: 0.10.3 tslib: 2.6.2 zen-observable-ts: 1.2.5 + transitivePeerDependencies: + - '@types/react' /@apollo/protobufjs@1.2.6: resolution: {integrity: sha512-Wqo1oSHNUj/jxmsVp4iR3I480p6qdqHikn38lKrFhfzcDJ7lwd7Ck7cHRl4JE81tWNArl77xhnG/OkZhxKBYOw==} @@ -1329,14 +1333,14 @@ packages: engines: {node: '>=16.0.0'} dependencies: '@aws-crypto/util': 5.2.0 - '@aws-sdk/types': 3.609.0 + '@aws-sdk/types': 3.679.0 tslib: 2.6.2 /@aws-crypto/crc32c@5.2.0: resolution: {integrity: sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==} dependencies: '@aws-crypto/util': 5.2.0 - '@aws-sdk/types': 3.609.0 + '@aws-sdk/types': 3.679.0 tslib: 2.6.2 /@aws-crypto/sha1-browser@5.2.0: @@ -1344,7 +1348,7 @@ packages: dependencies: '@aws-crypto/supports-web-crypto': 5.2.0 '@aws-crypto/util': 5.2.0 - '@aws-sdk/types': 3.609.0 + '@aws-sdk/types': 3.679.0 '@aws-sdk/util-locate-window': 3.465.0 '@smithy/util-utf8': 2.0.2 tslib: 2.6.2 @@ -1355,7 +1359,7 @@ packages: '@aws-crypto/sha256-js': 5.2.0 '@aws-crypto/supports-web-crypto': 5.2.0 '@aws-crypto/util': 5.2.0 - '@aws-sdk/types': 3.609.0 + '@aws-sdk/types': 3.679.0 '@aws-sdk/util-locate-window': 3.465.0 '@smithy/util-utf8': 2.0.2 tslib: 2.6.2 @@ -1365,7 +1369,7 @@ packages: engines: {node: '>=16.0.0'} dependencies: '@aws-crypto/util': 5.2.0 - '@aws-sdk/types': 3.609.0 + '@aws-sdk/types': 3.679.0 tslib: 2.6.2 /@aws-crypto/supports-web-crypto@5.2.0: @@ -1376,494 +1380,506 @@ packages: /@aws-crypto/util@5.2.0: resolution: {integrity: sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==} dependencies: - '@aws-sdk/types': 3.609.0 + '@aws-sdk/types': 3.679.0 '@smithy/util-utf8': 2.0.2 tslib: 2.6.2 - /@aws-sdk/client-s3@3.637.0: - resolution: {integrity: sha512-y6UC94fsMvhKbf0dzfnjVP1HePeGjplfcYfilZU1COIJLyTkMcUv4XcT4I407CGIrvgEafONHkiC09ygqUauNA==} + /@aws-sdk/client-s3@3.682.0: + resolution: {integrity: sha512-gn8yPhOmExhqRENnR/vKvsbTw9jaRPbfNE8fQ2j91ejXhpj632QDNdobY8TxxPm2UEW2ISAVM55r2/UPl0YP1Q==} engines: {node: '>=16.0.0'} dependencies: '@aws-crypto/sha1-browser': 5.2.0 '@aws-crypto/sha256-browser': 5.2.0 '@aws-crypto/sha256-js': 5.2.0 - '@aws-sdk/client-sso-oidc': 3.637.0(@aws-sdk/client-sts@3.637.0) - '@aws-sdk/client-sts': 3.637.0 - '@aws-sdk/core': 3.635.0 - '@aws-sdk/credential-provider-node': 3.637.0(@aws-sdk/client-sso-oidc@3.637.0)(@aws-sdk/client-sts@3.637.0) - '@aws-sdk/middleware-bucket-endpoint': 3.620.0 - '@aws-sdk/middleware-expect-continue': 3.620.0 - '@aws-sdk/middleware-flexible-checksums': 3.620.0 - '@aws-sdk/middleware-host-header': 3.620.0 - '@aws-sdk/middleware-location-constraint': 3.609.0 - '@aws-sdk/middleware-logger': 3.609.0 - '@aws-sdk/middleware-recursion-detection': 3.620.0 - '@aws-sdk/middleware-sdk-s3': 3.635.0 - '@aws-sdk/middleware-ssec': 3.609.0 - '@aws-sdk/middleware-user-agent': 3.637.0 - '@aws-sdk/region-config-resolver': 3.614.0 - '@aws-sdk/signature-v4-multi-region': 3.635.0 - '@aws-sdk/types': 3.609.0 - '@aws-sdk/util-endpoints': 3.637.0 - '@aws-sdk/util-user-agent-browser': 3.609.0 - '@aws-sdk/util-user-agent-node': 3.614.0 - '@aws-sdk/xml-builder': 3.609.0 - '@smithy/config-resolver': 3.0.5 - '@smithy/core': 2.4.0 - '@smithy/eventstream-serde-browser': 3.0.6 - '@smithy/eventstream-serde-config-resolver': 3.0.3 - '@smithy/eventstream-serde-node': 3.0.5 - '@smithy/fetch-http-handler': 3.2.4 - '@smithy/hash-blob-browser': 3.1.2 - '@smithy/hash-node': 3.0.3 - '@smithy/hash-stream-node': 3.1.2 - '@smithy/invalid-dependency': 3.0.3 - '@smithy/md5-js': 3.0.3 - '@smithy/middleware-content-length': 3.0.5 - '@smithy/middleware-endpoint': 3.1.0 - '@smithy/middleware-retry': 3.0.15 - '@smithy/middleware-serde': 3.0.3 - '@smithy/middleware-stack': 3.0.3 - '@smithy/node-config-provider': 3.1.4 - '@smithy/node-http-handler': 3.1.4 - '@smithy/protocol-http': 4.1.0 - '@smithy/smithy-client': 3.2.0 - '@smithy/types': 3.3.0 - '@smithy/url-parser': 3.0.3 + '@aws-sdk/client-sso-oidc': 3.682.0(@aws-sdk/client-sts@3.682.0) + '@aws-sdk/client-sts': 3.682.0 + '@aws-sdk/core': 3.679.0 + '@aws-sdk/credential-provider-node': 3.682.0(@aws-sdk/client-sso-oidc@3.682.0)(@aws-sdk/client-sts@3.682.0) + '@aws-sdk/middleware-bucket-endpoint': 3.679.0 + '@aws-sdk/middleware-expect-continue': 3.679.0 + '@aws-sdk/middleware-flexible-checksums': 3.682.0 + '@aws-sdk/middleware-host-header': 3.679.0 + '@aws-sdk/middleware-location-constraint': 3.679.0 + '@aws-sdk/middleware-logger': 3.679.0 + '@aws-sdk/middleware-recursion-detection': 3.679.0 + '@aws-sdk/middleware-sdk-s3': 3.682.0 + '@aws-sdk/middleware-ssec': 3.679.0 + '@aws-sdk/middleware-user-agent': 3.682.0 + '@aws-sdk/region-config-resolver': 3.679.0 + '@aws-sdk/signature-v4-multi-region': 3.682.0 + '@aws-sdk/types': 3.679.0 + '@aws-sdk/util-endpoints': 3.679.0 + '@aws-sdk/util-user-agent-browser': 3.679.0 + '@aws-sdk/util-user-agent-node': 3.682.0 + '@aws-sdk/xml-builder': 3.679.0 + '@smithy/config-resolver': 3.0.10 + '@smithy/core': 2.5.1 + '@smithy/eventstream-serde-browser': 3.0.11 + '@smithy/eventstream-serde-config-resolver': 3.0.8 + '@smithy/eventstream-serde-node': 3.0.10 + '@smithy/fetch-http-handler': 3.2.9 + '@smithy/hash-blob-browser': 3.1.7 + '@smithy/hash-node': 3.0.8 + '@smithy/hash-stream-node': 3.1.7 + '@smithy/invalid-dependency': 3.0.8 + '@smithy/md5-js': 3.0.8 + '@smithy/middleware-content-length': 3.0.10 + '@smithy/middleware-endpoint': 3.2.1 + '@smithy/middleware-retry': 3.0.25 + '@smithy/middleware-serde': 3.0.8 + '@smithy/middleware-stack': 3.0.8 + '@smithy/node-config-provider': 3.1.9 + '@smithy/node-http-handler': 3.2.5 + '@smithy/protocol-http': 4.1.5 + '@smithy/smithy-client': 3.4.2 + '@smithy/types': 3.6.0 + '@smithy/url-parser': 3.0.8 '@smithy/util-base64': 3.0.0 '@smithy/util-body-length-browser': 3.0.0 '@smithy/util-body-length-node': 3.0.0 - '@smithy/util-defaults-mode-browser': 3.0.15 - '@smithy/util-defaults-mode-node': 3.0.15 - '@smithy/util-endpoints': 2.0.5 - '@smithy/util-middleware': 3.0.3 - '@smithy/util-retry': 3.0.3 - '@smithy/util-stream': 3.1.3 + '@smithy/util-defaults-mode-browser': 3.0.25 + '@smithy/util-defaults-mode-node': 3.0.25 + '@smithy/util-endpoints': 2.1.4 + '@smithy/util-middleware': 3.0.8 + '@smithy/util-retry': 3.0.8 + '@smithy/util-stream': 3.2.1 '@smithy/util-utf8': 3.0.0 - '@smithy/util-waiter': 3.1.2 + '@smithy/util-waiter': 3.1.7 tslib: 2.6.2 transitivePeerDependencies: - aws-crt - /@aws-sdk/client-sso-oidc@3.637.0(@aws-sdk/client-sts@3.637.0): - resolution: {integrity: sha512-27bHALN6Qb6m6KZmPvRieJ/QRlj1lyac/GT2Rn5kJpre8Mpp+yxrtvp3h9PjNBty4lCeFEENfY4dGNSozBuBcw==} + /@aws-sdk/client-sso-oidc@3.682.0(@aws-sdk/client-sts@3.682.0): + resolution: {integrity: sha512-ZPZ7Y/r/w3nx/xpPzGSqSQsB090Xk5aZZOH+WBhTDn/pBEuim09BYXCLzvvxb7R7NnuoQdrTJiwimdJAhHl7ZQ==} engines: {node: '>=16.0.0'} peerDependencies: - '@aws-sdk/client-sts': ^3.637.0 + '@aws-sdk/client-sts': ^3.682.0 dependencies: '@aws-crypto/sha256-browser': 5.2.0 '@aws-crypto/sha256-js': 5.2.0 - '@aws-sdk/client-sts': 3.637.0 - '@aws-sdk/core': 3.635.0 - '@aws-sdk/credential-provider-node': 3.637.0(@aws-sdk/client-sso-oidc@3.637.0)(@aws-sdk/client-sts@3.637.0) - '@aws-sdk/middleware-host-header': 3.620.0 - '@aws-sdk/middleware-logger': 3.609.0 - '@aws-sdk/middleware-recursion-detection': 3.620.0 - '@aws-sdk/middleware-user-agent': 3.637.0 - '@aws-sdk/region-config-resolver': 3.614.0 - '@aws-sdk/types': 3.609.0 - '@aws-sdk/util-endpoints': 3.637.0 - '@aws-sdk/util-user-agent-browser': 3.609.0 - '@aws-sdk/util-user-agent-node': 3.614.0 - '@smithy/config-resolver': 3.0.5 - '@smithy/core': 2.4.0 - '@smithy/fetch-http-handler': 3.2.4 - '@smithy/hash-node': 3.0.3 - '@smithy/invalid-dependency': 3.0.3 - '@smithy/middleware-content-length': 3.0.5 - '@smithy/middleware-endpoint': 3.1.0 - '@smithy/middleware-retry': 3.0.15 - '@smithy/middleware-serde': 3.0.3 - '@smithy/middleware-stack': 3.0.3 - '@smithy/node-config-provider': 3.1.4 - '@smithy/node-http-handler': 3.1.4 - '@smithy/protocol-http': 4.1.0 - '@smithy/smithy-client': 3.2.0 - '@smithy/types': 3.3.0 - '@smithy/url-parser': 3.0.3 + '@aws-sdk/client-sts': 3.682.0 + '@aws-sdk/core': 3.679.0 + '@aws-sdk/credential-provider-node': 3.682.0(@aws-sdk/client-sso-oidc@3.682.0)(@aws-sdk/client-sts@3.682.0) + '@aws-sdk/middleware-host-header': 3.679.0 + '@aws-sdk/middleware-logger': 3.679.0 + '@aws-sdk/middleware-recursion-detection': 3.679.0 + '@aws-sdk/middleware-user-agent': 3.682.0 + '@aws-sdk/region-config-resolver': 3.679.0 + '@aws-sdk/types': 3.679.0 + '@aws-sdk/util-endpoints': 3.679.0 + '@aws-sdk/util-user-agent-browser': 3.679.0 + '@aws-sdk/util-user-agent-node': 3.682.0 + '@smithy/config-resolver': 3.0.10 + '@smithy/core': 2.5.1 + '@smithy/fetch-http-handler': 3.2.9 + '@smithy/hash-node': 3.0.8 + '@smithy/invalid-dependency': 3.0.8 + '@smithy/middleware-content-length': 3.0.10 + '@smithy/middleware-endpoint': 3.2.1 + '@smithy/middleware-retry': 3.0.25 + '@smithy/middleware-serde': 3.0.8 + '@smithy/middleware-stack': 3.0.8 + '@smithy/node-config-provider': 3.1.9 + '@smithy/node-http-handler': 3.2.5 + '@smithy/protocol-http': 4.1.5 + '@smithy/smithy-client': 3.4.2 + '@smithy/types': 3.6.0 + '@smithy/url-parser': 3.0.8 '@smithy/util-base64': 3.0.0 '@smithy/util-body-length-browser': 3.0.0 '@smithy/util-body-length-node': 3.0.0 - '@smithy/util-defaults-mode-browser': 3.0.15 - '@smithy/util-defaults-mode-node': 3.0.15 - '@smithy/util-endpoints': 2.0.5 - '@smithy/util-middleware': 3.0.3 - '@smithy/util-retry': 3.0.3 + '@smithy/util-defaults-mode-browser': 3.0.25 + '@smithy/util-defaults-mode-node': 3.0.25 + '@smithy/util-endpoints': 2.1.4 + '@smithy/util-middleware': 3.0.8 + '@smithy/util-retry': 3.0.8 '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 transitivePeerDependencies: - aws-crt - /@aws-sdk/client-sso@3.637.0: - resolution: {integrity: sha512-+KjLvgX5yJYROWo3TQuwBJlHCY0zz9PsLuEolmXQn0BVK1L/m9GteZHtd+rEdAoDGBpE0Xqjy1oz5+SmtsaRUw==} + /@aws-sdk/client-sso@3.682.0: + resolution: {integrity: sha512-PYH9RFUMYLFl66HSBq4tIx6fHViMLkhJHTYJoJONpBs+Td+NwVJ895AdLtDsBIhMS0YseCbPpuyjUCJgsUrwUw==} engines: {node: '>=16.0.0'} dependencies: '@aws-crypto/sha256-browser': 5.2.0 '@aws-crypto/sha256-js': 5.2.0 - '@aws-sdk/core': 3.635.0 - '@aws-sdk/middleware-host-header': 3.620.0 - '@aws-sdk/middleware-logger': 3.609.0 - '@aws-sdk/middleware-recursion-detection': 3.620.0 - '@aws-sdk/middleware-user-agent': 3.637.0 - '@aws-sdk/region-config-resolver': 3.614.0 - '@aws-sdk/types': 3.609.0 - '@aws-sdk/util-endpoints': 3.637.0 - '@aws-sdk/util-user-agent-browser': 3.609.0 - '@aws-sdk/util-user-agent-node': 3.614.0 - '@smithy/config-resolver': 3.0.5 - '@smithy/core': 2.4.0 - '@smithy/fetch-http-handler': 3.2.4 - '@smithy/hash-node': 3.0.3 - '@smithy/invalid-dependency': 3.0.3 - '@smithy/middleware-content-length': 3.0.5 - '@smithy/middleware-endpoint': 3.1.0 - '@smithy/middleware-retry': 3.0.15 - '@smithy/middleware-serde': 3.0.3 - '@smithy/middleware-stack': 3.0.3 - '@smithy/node-config-provider': 3.1.4 - '@smithy/node-http-handler': 3.1.4 - '@smithy/protocol-http': 4.1.0 - '@smithy/smithy-client': 3.2.0 - '@smithy/types': 3.3.0 - '@smithy/url-parser': 3.0.3 + '@aws-sdk/core': 3.679.0 + '@aws-sdk/middleware-host-header': 3.679.0 + '@aws-sdk/middleware-logger': 3.679.0 + '@aws-sdk/middleware-recursion-detection': 3.679.0 + '@aws-sdk/middleware-user-agent': 3.682.0 + '@aws-sdk/region-config-resolver': 3.679.0 + '@aws-sdk/types': 3.679.0 + '@aws-sdk/util-endpoints': 3.679.0 + '@aws-sdk/util-user-agent-browser': 3.679.0 + '@aws-sdk/util-user-agent-node': 3.682.0 + '@smithy/config-resolver': 3.0.10 + '@smithy/core': 2.5.1 + '@smithy/fetch-http-handler': 3.2.9 + '@smithy/hash-node': 3.0.8 + '@smithy/invalid-dependency': 3.0.8 + '@smithy/middleware-content-length': 3.0.10 + '@smithy/middleware-endpoint': 3.2.1 + '@smithy/middleware-retry': 3.0.25 + '@smithy/middleware-serde': 3.0.8 + '@smithy/middleware-stack': 3.0.8 + '@smithy/node-config-provider': 3.1.9 + '@smithy/node-http-handler': 3.2.5 + '@smithy/protocol-http': 4.1.5 + '@smithy/smithy-client': 3.4.2 + '@smithy/types': 3.6.0 + '@smithy/url-parser': 3.0.8 '@smithy/util-base64': 3.0.0 '@smithy/util-body-length-browser': 3.0.0 '@smithy/util-body-length-node': 3.0.0 - '@smithy/util-defaults-mode-browser': 3.0.15 - '@smithy/util-defaults-mode-node': 3.0.15 - '@smithy/util-endpoints': 2.0.5 - '@smithy/util-middleware': 3.0.3 - '@smithy/util-retry': 3.0.3 + '@smithy/util-defaults-mode-browser': 3.0.25 + '@smithy/util-defaults-mode-node': 3.0.25 + '@smithy/util-endpoints': 2.1.4 + '@smithy/util-middleware': 3.0.8 + '@smithy/util-retry': 3.0.8 '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 transitivePeerDependencies: - aws-crt - /@aws-sdk/client-sts@3.637.0: - resolution: {integrity: sha512-xUi7x4qDubtA8QREtlblPuAcn91GS/09YVEY/RwU7xCY0aqGuFwgszAANlha4OUIqva8oVj2WO4gJuG+iaSnhw==} + /@aws-sdk/client-sts@3.682.0: + resolution: {integrity: sha512-xKuo4HksZ+F8m9DOfx/ZuWNhaPuqZFPwwy0xqcBT6sWH7OAuBjv/fnpOTzyQhpVTWddlf+ECtMAMrxjxuOExGQ==} engines: {node: '>=16.0.0'} dependencies: '@aws-crypto/sha256-browser': 5.2.0 '@aws-crypto/sha256-js': 5.2.0 - '@aws-sdk/client-sso-oidc': 3.637.0(@aws-sdk/client-sts@3.637.0) - '@aws-sdk/core': 3.635.0 - '@aws-sdk/credential-provider-node': 3.637.0(@aws-sdk/client-sso-oidc@3.637.0)(@aws-sdk/client-sts@3.637.0) - '@aws-sdk/middleware-host-header': 3.620.0 - '@aws-sdk/middleware-logger': 3.609.0 - '@aws-sdk/middleware-recursion-detection': 3.620.0 - '@aws-sdk/middleware-user-agent': 3.637.0 - '@aws-sdk/region-config-resolver': 3.614.0 - '@aws-sdk/types': 3.609.0 - '@aws-sdk/util-endpoints': 3.637.0 - '@aws-sdk/util-user-agent-browser': 3.609.0 - '@aws-sdk/util-user-agent-node': 3.614.0 - '@smithy/config-resolver': 3.0.5 - '@smithy/core': 2.4.0 - '@smithy/fetch-http-handler': 3.2.4 - '@smithy/hash-node': 3.0.3 - '@smithy/invalid-dependency': 3.0.3 - '@smithy/middleware-content-length': 3.0.5 - '@smithy/middleware-endpoint': 3.1.0 - '@smithy/middleware-retry': 3.0.15 - '@smithy/middleware-serde': 3.0.3 - '@smithy/middleware-stack': 3.0.3 - '@smithy/node-config-provider': 3.1.4 - '@smithy/node-http-handler': 3.1.4 - '@smithy/protocol-http': 4.1.0 - '@smithy/smithy-client': 3.2.0 - '@smithy/types': 3.3.0 - '@smithy/url-parser': 3.0.3 + '@aws-sdk/client-sso-oidc': 3.682.0(@aws-sdk/client-sts@3.682.0) + '@aws-sdk/core': 3.679.0 + '@aws-sdk/credential-provider-node': 3.682.0(@aws-sdk/client-sso-oidc@3.682.0)(@aws-sdk/client-sts@3.682.0) + '@aws-sdk/middleware-host-header': 3.679.0 + '@aws-sdk/middleware-logger': 3.679.0 + '@aws-sdk/middleware-recursion-detection': 3.679.0 + '@aws-sdk/middleware-user-agent': 3.682.0 + '@aws-sdk/region-config-resolver': 3.679.0 + '@aws-sdk/types': 3.679.0 + '@aws-sdk/util-endpoints': 3.679.0 + '@aws-sdk/util-user-agent-browser': 3.679.0 + '@aws-sdk/util-user-agent-node': 3.682.0 + '@smithy/config-resolver': 3.0.10 + '@smithy/core': 2.5.1 + '@smithy/fetch-http-handler': 3.2.9 + '@smithy/hash-node': 3.0.8 + '@smithy/invalid-dependency': 3.0.8 + '@smithy/middleware-content-length': 3.0.10 + '@smithy/middleware-endpoint': 3.2.1 + '@smithy/middleware-retry': 3.0.25 + '@smithy/middleware-serde': 3.0.8 + '@smithy/middleware-stack': 3.0.8 + '@smithy/node-config-provider': 3.1.9 + '@smithy/node-http-handler': 3.2.5 + '@smithy/protocol-http': 4.1.5 + '@smithy/smithy-client': 3.4.2 + '@smithy/types': 3.6.0 + '@smithy/url-parser': 3.0.8 '@smithy/util-base64': 3.0.0 '@smithy/util-body-length-browser': 3.0.0 '@smithy/util-body-length-node': 3.0.0 - '@smithy/util-defaults-mode-browser': 3.0.15 - '@smithy/util-defaults-mode-node': 3.0.15 - '@smithy/util-endpoints': 2.0.5 - '@smithy/util-middleware': 3.0.3 - '@smithy/util-retry': 3.0.3 + '@smithy/util-defaults-mode-browser': 3.0.25 + '@smithy/util-defaults-mode-node': 3.0.25 + '@smithy/util-endpoints': 2.1.4 + '@smithy/util-middleware': 3.0.8 + '@smithy/util-retry': 3.0.8 '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 transitivePeerDependencies: - aws-crt - /@aws-sdk/core@3.635.0: - resolution: {integrity: sha512-i1x/E/sgA+liUE1XJ7rj1dhyXpAKO1UKFUcTTHXok2ARjWTvszHnSXMOsB77aPbmn0fUp1JTx2kHUAZ1LVt5Bg==} + /@aws-sdk/core@3.679.0: + resolution: {integrity: sha512-CS6PWGX8l4v/xyvX8RtXnBisdCa5+URzKd0L6GvHChype9qKUVxO/Gg6N/y43Hvg7MNWJt9FBPNWIxUB+byJwg==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/core': 2.4.0 - '@smithy/node-config-provider': 3.1.4 - '@smithy/property-provider': 3.1.3 - '@smithy/protocol-http': 4.1.0 - '@smithy/signature-v4': 4.1.0 - '@smithy/smithy-client': 3.2.0 - '@smithy/types': 3.3.0 - '@smithy/util-middleware': 3.0.3 + '@aws-sdk/types': 3.679.0 + '@smithy/core': 2.5.1 + '@smithy/node-config-provider': 3.1.9 + '@smithy/property-provider': 3.1.8 + '@smithy/protocol-http': 4.1.5 + '@smithy/signature-v4': 4.2.1 + '@smithy/smithy-client': 3.4.2 + '@smithy/types': 3.6.0 + '@smithy/util-middleware': 3.0.8 fast-xml-parser: 4.4.1 tslib: 2.6.2 - /@aws-sdk/credential-provider-env@3.620.1: - resolution: {integrity: sha512-ExuILJ2qLW5ZO+rgkNRj0xiAipKT16Rk77buvPP8csR7kkCflT/gXTyzRe/uzIiETTxM7tr8xuO9MP/DQXqkfg==} + /@aws-sdk/credential-provider-env@3.679.0: + resolution: {integrity: sha512-EdlTYbzMm3G7VUNAMxr9S1nC1qUNqhKlAxFU8E7cKsAe8Bp29CD5HAs3POc56AVo9GC4yRIS+/mtlZSmrckzUA==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.609.0 - '@smithy/property-provider': 3.1.3 - '@smithy/types': 3.3.0 + '@aws-sdk/core': 3.679.0 + '@aws-sdk/types': 3.679.0 + '@smithy/property-provider': 3.1.8 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/credential-provider-http@3.635.0: - resolution: {integrity: sha512-iJyRgEjOCQlBMXqtwPLIKYc7Bsc6nqjrZybdMDenPDa+kmLg7xh8LxHsu9088e+2/wtLicE34FsJJIfzu3L82g==} + /@aws-sdk/credential-provider-http@3.679.0: + resolution: {integrity: sha512-ZoKLubW5DqqV1/2a3TSn+9sSKg0T8SsYMt1JeirnuLJF0mCoYFUaWMyvxxKuxPoqvUsaycxKru4GkpJ10ltNBw==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.609.0 - '@smithy/fetch-http-handler': 3.2.4 - '@smithy/node-http-handler': 3.1.4 - '@smithy/property-provider': 3.1.3 - '@smithy/protocol-http': 4.1.0 - '@smithy/smithy-client': 3.2.0 - '@smithy/types': 3.3.0 - '@smithy/util-stream': 3.1.3 + '@aws-sdk/core': 3.679.0 + '@aws-sdk/types': 3.679.0 + '@smithy/fetch-http-handler': 3.2.9 + '@smithy/node-http-handler': 3.2.5 + '@smithy/property-provider': 3.1.8 + '@smithy/protocol-http': 4.1.5 + '@smithy/smithy-client': 3.4.2 + '@smithy/types': 3.6.0 + '@smithy/util-stream': 3.2.1 tslib: 2.6.2 - /@aws-sdk/credential-provider-ini@3.637.0(@aws-sdk/client-sso-oidc@3.637.0)(@aws-sdk/client-sts@3.637.0): - resolution: {integrity: sha512-h+PFCWfZ0Q3Dx84SppET/TFpcQHmxFW8/oV9ArEvMilw4EBN+IlxgbL0CnHwjHW64szcmrM0mbebjEfHf4FXmw==} + /@aws-sdk/credential-provider-ini@3.682.0(@aws-sdk/client-sso-oidc@3.682.0)(@aws-sdk/client-sts@3.682.0): + resolution: {integrity: sha512-6eqWeHdK6EegAxqDdiCi215nT3QZPwukgWAYuVxNfJ/5m0/P7fAzF+D5kKVgByUvGJEbq/FEL8Fw7OBe64AA+g==} engines: {node: '>=16.0.0'} peerDependencies: - '@aws-sdk/client-sts': ^3.637.0 - dependencies: - '@aws-sdk/client-sts': 3.637.0 - '@aws-sdk/credential-provider-env': 3.620.1 - '@aws-sdk/credential-provider-http': 3.635.0 - '@aws-sdk/credential-provider-process': 3.620.1 - '@aws-sdk/credential-provider-sso': 3.637.0(@aws-sdk/client-sso-oidc@3.637.0) - '@aws-sdk/credential-provider-web-identity': 3.621.0(@aws-sdk/client-sts@3.637.0) - '@aws-sdk/types': 3.609.0 - '@smithy/credential-provider-imds': 3.2.0 - '@smithy/property-provider': 3.1.3 - '@smithy/shared-ini-file-loader': 3.1.4 - '@smithy/types': 3.3.0 + '@aws-sdk/client-sts': ^3.682.0 + dependencies: + '@aws-sdk/client-sts': 3.682.0 + '@aws-sdk/core': 3.679.0 + '@aws-sdk/credential-provider-env': 3.679.0 + '@aws-sdk/credential-provider-http': 3.679.0 + '@aws-sdk/credential-provider-process': 3.679.0 + '@aws-sdk/credential-provider-sso': 3.682.0(@aws-sdk/client-sso-oidc@3.682.0) + '@aws-sdk/credential-provider-web-identity': 3.679.0(@aws-sdk/client-sts@3.682.0) + '@aws-sdk/types': 3.679.0 + '@smithy/credential-provider-imds': 3.2.5 + '@smithy/property-provider': 3.1.8 + '@smithy/shared-ini-file-loader': 3.1.9 + '@smithy/types': 3.6.0 tslib: 2.6.2 transitivePeerDependencies: - '@aws-sdk/client-sso-oidc' - aws-crt - /@aws-sdk/credential-provider-node@3.637.0(@aws-sdk/client-sso-oidc@3.637.0)(@aws-sdk/client-sts@3.637.0): - resolution: {integrity: sha512-yoEhoxJJfs7sPVQ6Is939BDQJZpZCoUgKr/ySse4YKOZ24t4VqgHA6+wV7rYh+7IW24Rd91UTvEzSuHYTlxlNA==} + /@aws-sdk/credential-provider-node@3.682.0(@aws-sdk/client-sso-oidc@3.682.0)(@aws-sdk/client-sts@3.682.0): + resolution: {integrity: sha512-HSmDqZcBVZrTctHCT9m++vdlDfJ1ARI218qmZa+TZzzOFNpKWy6QyHMEra45GB9GnkkMmV6unoDSPMuN0AqcMg==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/credential-provider-env': 3.620.1 - '@aws-sdk/credential-provider-http': 3.635.0 - '@aws-sdk/credential-provider-ini': 3.637.0(@aws-sdk/client-sso-oidc@3.637.0)(@aws-sdk/client-sts@3.637.0) - '@aws-sdk/credential-provider-process': 3.620.1 - '@aws-sdk/credential-provider-sso': 3.637.0(@aws-sdk/client-sso-oidc@3.637.0) - '@aws-sdk/credential-provider-web-identity': 3.621.0(@aws-sdk/client-sts@3.637.0) - '@aws-sdk/types': 3.609.0 - '@smithy/credential-provider-imds': 3.2.0 - '@smithy/property-provider': 3.1.3 - '@smithy/shared-ini-file-loader': 3.1.4 - '@smithy/types': 3.3.0 + '@aws-sdk/credential-provider-env': 3.679.0 + '@aws-sdk/credential-provider-http': 3.679.0 + '@aws-sdk/credential-provider-ini': 3.682.0(@aws-sdk/client-sso-oidc@3.682.0)(@aws-sdk/client-sts@3.682.0) + '@aws-sdk/credential-provider-process': 3.679.0 + '@aws-sdk/credential-provider-sso': 3.682.0(@aws-sdk/client-sso-oidc@3.682.0) + '@aws-sdk/credential-provider-web-identity': 3.679.0(@aws-sdk/client-sts@3.682.0) + '@aws-sdk/types': 3.679.0 + '@smithy/credential-provider-imds': 3.2.5 + '@smithy/property-provider': 3.1.8 + '@smithy/shared-ini-file-loader': 3.1.9 + '@smithy/types': 3.6.0 tslib: 2.6.2 transitivePeerDependencies: - '@aws-sdk/client-sso-oidc' - '@aws-sdk/client-sts' - aws-crt - /@aws-sdk/credential-provider-process@3.620.1: - resolution: {integrity: sha512-hWqFMidqLAkaV9G460+1at6qa9vySbjQKKc04p59OT7lZ5cO5VH5S4aI05e+m4j364MBROjjk2ugNvfNf/8ILg==} + /@aws-sdk/credential-provider-process@3.679.0: + resolution: {integrity: sha512-u/p4TV8kQ0zJWDdZD4+vdQFTMhkDEJFws040Gm113VHa/Xo1SYOjbpvqeuFoz6VmM0bLvoOWjxB9MxnSQbwKpQ==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.609.0 - '@smithy/property-provider': 3.1.3 - '@smithy/shared-ini-file-loader': 3.1.4 - '@smithy/types': 3.3.0 + '@aws-sdk/core': 3.679.0 + '@aws-sdk/types': 3.679.0 + '@smithy/property-provider': 3.1.8 + '@smithy/shared-ini-file-loader': 3.1.9 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/credential-provider-sso@3.637.0(@aws-sdk/client-sso-oidc@3.637.0): - resolution: {integrity: sha512-Mvz+h+e62/tl+dVikLafhv+qkZJ9RUb8l2YN/LeKMWkxQylPT83CPk9aimVhCV89zth1zpREArl97+3xsfgQvA==} + /@aws-sdk/credential-provider-sso@3.682.0(@aws-sdk/client-sso-oidc@3.682.0): + resolution: {integrity: sha512-h7IH1VsWgV6YAJSWWV6y8uaRjGqLY3iBpGZlXuTH/c236NMLaNv+WqCBLeBxkFGUb2WeQ+FUPEJDCD69rgLIkg==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/client-sso': 3.637.0 - '@aws-sdk/token-providers': 3.614.0(@aws-sdk/client-sso-oidc@3.637.0) - '@aws-sdk/types': 3.609.0 - '@smithy/property-provider': 3.1.3 - '@smithy/shared-ini-file-loader': 3.1.4 - '@smithy/types': 3.3.0 + '@aws-sdk/client-sso': 3.682.0 + '@aws-sdk/core': 3.679.0 + '@aws-sdk/token-providers': 3.679.0(@aws-sdk/client-sso-oidc@3.682.0) + '@aws-sdk/types': 3.679.0 + '@smithy/property-provider': 3.1.8 + '@smithy/shared-ini-file-loader': 3.1.9 + '@smithy/types': 3.6.0 tslib: 2.6.2 transitivePeerDependencies: - '@aws-sdk/client-sso-oidc' - aws-crt - /@aws-sdk/credential-provider-web-identity@3.621.0(@aws-sdk/client-sts@3.637.0): - resolution: {integrity: sha512-w7ASSyfNvcx7+bYGep3VBgC3K6vEdLmlpjT7nSIHxxQf+WSdvy+HynwJosrpZax0sK5q0D1Jpn/5q+r5lwwW6w==} + /@aws-sdk/credential-provider-web-identity@3.679.0(@aws-sdk/client-sts@3.682.0): + resolution: {integrity: sha512-a74tLccVznXCaBefWPSysUcLXYJiSkeUmQGtalNgJ1vGkE36W5l/8czFiiowdWdKWz7+x6xf0w+Kjkjlj42Ung==} engines: {node: '>=16.0.0'} peerDependencies: - '@aws-sdk/client-sts': ^3.621.0 + '@aws-sdk/client-sts': ^3.679.0 dependencies: - '@aws-sdk/client-sts': 3.637.0 - '@aws-sdk/types': 3.609.0 - '@smithy/property-provider': 3.1.3 - '@smithy/types': 3.3.0 + '@aws-sdk/client-sts': 3.682.0 + '@aws-sdk/core': 3.679.0 + '@aws-sdk/types': 3.679.0 + '@smithy/property-provider': 3.1.8 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/middleware-bucket-endpoint@3.620.0: - resolution: {integrity: sha512-eGLL0W6L3HDb3OACyetZYOWpHJ+gLo0TehQKeQyy2G8vTYXqNTeqYhuI6up9HVjBzU9eQiULVQETmgQs7TFaRg==} + /@aws-sdk/middleware-bucket-endpoint@3.679.0: + resolution: {integrity: sha512-5EpiPhhGgnF+uJR4DzWUk6Lx3pOn9oM6JGXxeHsiynfoBfq7vHMleq+uABHHSQS+y7XzbyZ7x8tXNQlliMwOsg==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.609.0 - '@aws-sdk/util-arn-parser': 3.568.0 - '@smithy/node-config-provider': 3.1.4 - '@smithy/protocol-http': 4.1.0 - '@smithy/types': 3.3.0 + '@aws-sdk/types': 3.679.0 + '@aws-sdk/util-arn-parser': 3.679.0 + '@smithy/node-config-provider': 3.1.9 + '@smithy/protocol-http': 4.1.5 + '@smithy/types': 3.6.0 '@smithy/util-config-provider': 3.0.0 tslib: 2.6.2 - /@aws-sdk/middleware-expect-continue@3.620.0: - resolution: {integrity: sha512-QXeRFMLfyQ31nAHLbiTLtk0oHzG9QLMaof5jIfqcUwnOkO8YnQdeqzakrg1Alpy/VQ7aqzIi8qypkBe2KXZz0A==} + /@aws-sdk/middleware-expect-continue@3.679.0: + resolution: {integrity: sha512-nYsh9PdWrF4EahTRdXHGlNud82RPc508CNGdh1lAGfPU3tNveGfMBX3PcGBtPOse3p9ebNKRWVmUc9eXSjGvHA==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.609.0 - '@smithy/protocol-http': 4.1.0 - '@smithy/types': 3.3.0 + '@aws-sdk/types': 3.679.0 + '@smithy/protocol-http': 4.1.5 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/middleware-flexible-checksums@3.620.0: - resolution: {integrity: sha512-ftz+NW7qka2sVuwnnO1IzBku5ccP+s5qZGeRTPgrKB7OzRW85gthvIo1vQR2w+OwHFk7WJbbhhWwbCbktnP4UA==} + /@aws-sdk/middleware-flexible-checksums@3.682.0: + resolution: {integrity: sha512-5u1STth6iZUtAvPDO0NJVYKUX2EYKU7v84MYYaZ3O27HphRjFqDos0keL2KTnHn/KmMD68rM3yiUareWR8hnAQ==} engines: {node: '>=16.0.0'} dependencies: '@aws-crypto/crc32': 5.2.0 '@aws-crypto/crc32c': 5.2.0 - '@aws-sdk/types': 3.609.0 + '@aws-sdk/core': 3.679.0 + '@aws-sdk/types': 3.679.0 '@smithy/is-array-buffer': 3.0.0 - '@smithy/protocol-http': 4.1.0 - '@smithy/types': 3.3.0 + '@smithy/node-config-provider': 3.1.9 + '@smithy/protocol-http': 4.1.5 + '@smithy/types': 3.6.0 + '@smithy/util-middleware': 3.0.8 '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 - /@aws-sdk/middleware-host-header@3.620.0: - resolution: {integrity: sha512-VMtPEZwqYrII/oUkffYsNWY9PZ9xpNJpMgmyU0rlDQ25O1c0Hk3fJmZRe6pEkAJ0omD7kLrqGl1DUjQVxpd/Rg==} + /@aws-sdk/middleware-host-header@3.679.0: + resolution: {integrity: sha512-y176HuQ8JRY3hGX8rQzHDSbCl9P5Ny9l16z4xmaiLo+Qfte7ee4Yr3yaAKd7GFoJ3/Mhud2XZ37fR015MfYl2w==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.609.0 - '@smithy/protocol-http': 4.1.0 - '@smithy/types': 3.3.0 + '@aws-sdk/types': 3.679.0 + '@smithy/protocol-http': 4.1.5 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/middleware-location-constraint@3.609.0: - resolution: {integrity: sha512-xzsdoTkszGVqGVPjUmgoP7TORiByLueMHieI1fhQL888WPdqctwAx3ES6d/bA9Q/i8jnc6hs+Fjhy8UvBTkE9A==} + /@aws-sdk/middleware-location-constraint@3.679.0: + resolution: {integrity: sha512-SA1C1D3XgoKTGxyNsOqd016ONpk46xJLWDgJUd00Zb21Ox5wYCoY6aDRKiaMRW+1VfCJdezs1Do3XLyIU9KxyA==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.609.0 - '@smithy/types': 3.3.0 + '@aws-sdk/types': 3.679.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/middleware-logger@3.609.0: - resolution: {integrity: sha512-S62U2dy4jMDhDFDK5gZ4VxFdWzCtLzwbYyFZx2uvPYTECkepLUfzLic2BHg2Qvtu4QjX+oGE3P/7fwaGIsGNuQ==} + /@aws-sdk/middleware-logger@3.679.0: + resolution: {integrity: sha512-0vet8InEj7nvIvGKk+ch7bEF5SyZ7Us9U7YTEgXPrBNStKeRUsgwRm0ijPWWd0a3oz2okaEwXsFl7G/vI0XiEA==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.609.0 - '@smithy/types': 3.3.0 + '@aws-sdk/types': 3.679.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/middleware-recursion-detection@3.620.0: - resolution: {integrity: sha512-nh91S7aGK3e/o1ck64sA/CyoFw+gAYj2BDOnoNa6ouyCrVJED96ZXWbhye/fz9SgmNUZR2g7GdVpiLpMKZoI5w==} + /@aws-sdk/middleware-recursion-detection@3.679.0: + resolution: {integrity: sha512-sQoAZFsQiW/LL3DfKMYwBoGjYDEnMbA9WslWN8xneCmBAwKo6IcSksvYs23PP8XMIoBGe2I2J9BSr654XWygTQ==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.609.0 - '@smithy/protocol-http': 4.1.0 - '@smithy/types': 3.3.0 + '@aws-sdk/types': 3.679.0 + '@smithy/protocol-http': 4.1.5 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/middleware-sdk-s3@3.635.0: - resolution: {integrity: sha512-RLdYJPEV4JL/7NBoFUs7VlP90X++5FlJdxHz0DzCjmiD3qCviKy+Cym3qg1gBgHwucs5XisuClxDrGokhAdTQw==} + /@aws-sdk/middleware-sdk-s3@3.682.0: + resolution: {integrity: sha512-Tqndx8elRD4xDR8f5Cng6jpZ/odcm1ZTOtGRFMzHgOCij4BeMf4+/+ecQScobcrAZpUTCUTCzaTvdCdJw8MYJA==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/core': 3.635.0 - '@aws-sdk/types': 3.609.0 - '@aws-sdk/util-arn-parser': 3.568.0 - '@smithy/core': 2.4.0 - '@smithy/node-config-provider': 3.1.4 - '@smithy/protocol-http': 4.1.0 - '@smithy/signature-v4': 4.1.0 - '@smithy/smithy-client': 3.2.0 - '@smithy/types': 3.3.0 + '@aws-sdk/core': 3.679.0 + '@aws-sdk/types': 3.679.0 + '@aws-sdk/util-arn-parser': 3.679.0 + '@smithy/core': 2.5.1 + '@smithy/node-config-provider': 3.1.9 + '@smithy/protocol-http': 4.1.5 + '@smithy/signature-v4': 4.2.1 + '@smithy/smithy-client': 3.4.2 + '@smithy/types': 3.6.0 '@smithy/util-config-provider': 3.0.0 - '@smithy/util-middleware': 3.0.3 - '@smithy/util-stream': 3.1.3 + '@smithy/util-middleware': 3.0.8 + '@smithy/util-stream': 3.2.1 '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 - /@aws-sdk/middleware-ssec@3.609.0: - resolution: {integrity: sha512-GZSD1s7+JswWOTamVap79QiDaIV7byJFssBW68GYjyRS5EBjNfwA/8s+6uE6g39R3ojyTbYOmvcANoZEhSULXg==} + /@aws-sdk/middleware-ssec@3.679.0: + resolution: {integrity: sha512-4GNUxXbs1M71uFHRiCAZtN0/g23ogI9YjMe5isAuYMHXwDB3MhqF7usKf954mBP6tplvN44vYlbJ84faaLrTtg==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.609.0 - '@smithy/types': 3.3.0 + '@aws-sdk/types': 3.679.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/middleware-user-agent@3.637.0: - resolution: {integrity: sha512-EYo0NE9/da/OY8STDsK2LvM4kNa79DBsf4YVtaG4P5pZ615IeFsD8xOHZeuJmUrSMlVQ8ywPRX7WMucUybsKug==} + /@aws-sdk/middleware-user-agent@3.682.0: + resolution: {integrity: sha512-7TyvYR9HdGH1/Nq0eeApUTM4izB6rExiw87khVYuJwZHr6FmvIL1FsOVFro/4WlXa0lg4LiYOm/8H8dHv+fXTg==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.609.0 - '@aws-sdk/util-endpoints': 3.637.0 - '@smithy/protocol-http': 4.1.0 - '@smithy/types': 3.3.0 + '@aws-sdk/core': 3.679.0 + '@aws-sdk/types': 3.679.0 + '@aws-sdk/util-endpoints': 3.679.0 + '@smithy/core': 2.5.1 + '@smithy/protocol-http': 4.1.5 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/region-config-resolver@3.614.0: - resolution: {integrity: sha512-vDCeMXvic/LU0KFIUjpC3RiSTIkkvESsEfbVHiHH0YINfl8HnEqR5rj+L8+phsCeVg2+LmYwYxd5NRz4PHxt5g==} + /@aws-sdk/region-config-resolver@3.679.0: + resolution: {integrity: sha512-Ybx54P8Tg6KKq5ck7uwdjiKif7n/8g1x+V0V9uTjBjRWqaIgiqzXwKWoPj6NCNkE7tJNtqI4JrNxp/3S3HvmRw==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.609.0 - '@smithy/node-config-provider': 3.1.4 - '@smithy/types': 3.3.0 + '@aws-sdk/types': 3.679.0 + '@smithy/node-config-provider': 3.1.9 + '@smithy/types': 3.6.0 '@smithy/util-config-provider': 3.0.0 - '@smithy/util-middleware': 3.0.3 + '@smithy/util-middleware': 3.0.8 tslib: 2.6.2 - /@aws-sdk/signature-v4-multi-region@3.635.0: - resolution: {integrity: sha512-J6QY4/invOkpogCHjSaDON1hF03viPpOnsrzVuCvJMmclS/iG62R4EY0wq1alYll0YmSdmKlpJwHMWwGtqK63Q==} + /@aws-sdk/signature-v4-multi-region@3.682.0: + resolution: {integrity: sha512-y7RAQSCb9pH8wCX5We9UXfiqPVwBLLvSljhuXC31mibHmYaZnpNEwHiQlRNQPblyaNpiKnXXQ0H3Ns3FDyDYdQ==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/middleware-sdk-s3': 3.635.0 - '@aws-sdk/types': 3.609.0 - '@smithy/protocol-http': 4.1.0 - '@smithy/signature-v4': 4.1.0 - '@smithy/types': 3.3.0 + '@aws-sdk/middleware-sdk-s3': 3.682.0 + '@aws-sdk/types': 3.679.0 + '@smithy/protocol-http': 4.1.5 + '@smithy/signature-v4': 4.2.1 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/token-providers@3.614.0(@aws-sdk/client-sso-oidc@3.637.0): - resolution: {integrity: sha512-okItqyY6L9IHdxqs+Z116y5/nda7rHxLvROxtAJdLavWTYDydxrZstImNgGWTeVdmc0xX2gJCI77UYUTQWnhRw==} + /@aws-sdk/token-providers@3.679.0(@aws-sdk/client-sso-oidc@3.682.0): + resolution: {integrity: sha512-1/+Zso/x2jqgutKixYFQEGli0FELTgah6bm7aB+m2FAWH4Hz7+iMUsazg6nSWm714sG9G3h5u42Dmpvi9X6/hA==} engines: {node: '>=16.0.0'} peerDependencies: - '@aws-sdk/client-sso-oidc': ^3.614.0 + '@aws-sdk/client-sso-oidc': ^3.679.0 dependencies: - '@aws-sdk/client-sso-oidc': 3.637.0(@aws-sdk/client-sts@3.637.0) - '@aws-sdk/types': 3.609.0 - '@smithy/property-provider': 3.1.3 - '@smithy/shared-ini-file-loader': 3.1.4 - '@smithy/types': 3.3.0 + '@aws-sdk/client-sso-oidc': 3.682.0(@aws-sdk/client-sts@3.682.0) + '@aws-sdk/types': 3.679.0 + '@smithy/property-provider': 3.1.8 + '@smithy/shared-ini-file-loader': 3.1.9 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/types@3.609.0: - resolution: {integrity: sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==} + /@aws-sdk/types@3.679.0: + resolution: {integrity: sha512-NwVq8YvInxQdJ47+zz4fH3BRRLC6lL+WLkvr242PVBbUOLRyK/lkwHlfiKUoeVIMyK5NF+up6TRg71t/8Bny6Q==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 3.3.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/util-arn-parser@3.568.0: - resolution: {integrity: sha512-XUKJWWo+KOB7fbnPP0+g/o5Ulku/X53t7i/h+sPHr5xxYTJJ9CYnbToo95mzxe7xWvkLrsNtJ8L+MnNn9INs2w==} + /@aws-sdk/util-arn-parser@3.679.0: + resolution: {integrity: sha512-CwzEbU8R8rq9bqUFryO50RFBlkfufV9UfMArHPWlo+lmsC+NlSluHQALoj6Jkq3zf5ppn1CN0c1DDLrEqdQUXg==} engines: {node: '>=16.0.0'} dependencies: tslib: 2.6.2 - /@aws-sdk/util-endpoints@3.637.0: - resolution: {integrity: sha512-pAqOKUHeVWHEXXDIp/qoMk/6jyxIb6GGjnK1/f8dKHtKIEs4tKsnnL563gceEvdad53OPXIt86uoevCcCzmBnw==} + /@aws-sdk/util-endpoints@3.679.0: + resolution: {integrity: sha512-YL6s4Y/1zC45OvddvgE139fjeWSKKPgLlnfrvhVL7alNyY9n7beR4uhoDpNrt5mI6sn9qiBF17790o+xLAXjjg==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.609.0 - '@smithy/types': 3.3.0 - '@smithy/util-endpoints': 2.0.5 + '@aws-sdk/types': 3.679.0 + '@smithy/types': 3.6.0 + '@smithy/util-endpoints': 2.1.4 tslib: 2.6.2 /@aws-sdk/util-locate-window@3.465.0: @@ -1872,16 +1888,16 @@ packages: dependencies: tslib: 2.6.2 - /@aws-sdk/util-user-agent-browser@3.609.0: - resolution: {integrity: sha512-fojPU+mNahzQ0YHYBsx0ZIhmMA96H+ZIZ665ObU9tl+SGdbLneVZVikGve+NmHTQwHzwkFsZYYnVKAkreJLAtA==} + /@aws-sdk/util-user-agent-browser@3.679.0: + resolution: {integrity: sha512-CusSm2bTBG1kFypcsqU8COhnYc6zltobsqs3nRrvYqYaOqtMnuE46K4XTWpnzKgwDejgZGOE+WYyprtAxrPvmQ==} dependencies: - '@aws-sdk/types': 3.609.0 - '@smithy/types': 3.3.0 + '@aws-sdk/types': 3.679.0 + '@smithy/types': 3.6.0 bowser: 2.11.0 tslib: 2.6.2 - /@aws-sdk/util-user-agent-node@3.614.0: - resolution: {integrity: sha512-15ElZT88peoHnq5TEoEtZwoXTXRxNrk60TZNdpl/TUBJ5oNJ9Dqb5Z4ryb8ofN6nm9aFf59GVAerFDz8iUoHBA==} + /@aws-sdk/util-user-agent-node@3.682.0: + resolution: {integrity: sha512-so5s+j0gPoTS0HM4HPL+G0ajk0T6cQAg8JXzRgvyiQAxqie+zGCZAV3VuVeMNWMVbzsgZl0pYZaatPFTLG/AxA==} engines: {node: '>=16.0.0'} peerDependencies: aws-crt: '>=1.0.0' @@ -1889,16 +1905,17 @@ packages: aws-crt: optional: true dependencies: - '@aws-sdk/types': 3.609.0 - '@smithy/node-config-provider': 3.1.4 - '@smithy/types': 3.3.0 + '@aws-sdk/middleware-user-agent': 3.682.0 + '@aws-sdk/types': 3.679.0 + '@smithy/node-config-provider': 3.1.9 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/xml-builder@3.609.0: - resolution: {integrity: sha512-l9XxNcA4HX98rwCC2/KoiWcmEiRfZe4G+mYwDbCFT87JIMj6GBhLDkAzr/W8KAaA2IDr8Vc6J8fZPgVulxxfMA==} + /@aws-sdk/xml-builder@3.679.0: + resolution: {integrity: sha512-nPmhVZb39ty5bcQ7mAwtjezBcsBqTYZ9A2D9v/lE92KCLdu5RhSkPH7O71ZqbZx1mUSg9fAOxHPiG79U5VlpLQ==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 3.3.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 /@azure-rest/ai-translation-text@1.0.0: @@ -1907,7 +1924,7 @@ packages: dependencies: '@azure-rest/core-client': 1.4.0 '@azure/core-auth': 1.5.0 - '@azure/core-rest-pipeline': 1.16.3 + '@azure/core-rest-pipeline': 1.17.0 '@azure/logger': 1.0.4 tslib: 2.6.2 transitivePeerDependencies: @@ -1919,9 +1936,9 @@ packages: dependencies: '@azure/abort-controller': 2.1.2 '@azure/core-auth': 1.5.0 - '@azure/core-rest-pipeline': 1.16.3 - '@azure/core-tracing': 1.1.2 - '@azure/core-util': 1.9.2 + '@azure/core-rest-pipeline': 1.17.0 + '@azure/core-tracing': 1.2.0 + '@azure/core-util': 1.6.1 tslib: 2.6.2 transitivePeerDependencies: - supports-color @@ -1943,7 +1960,15 @@ packages: engines: {node: '>=14.0.0'} dependencies: '@azure/abort-controller': 1.1.0 - '@azure/core-util': 1.9.2 + '@azure/core-util': 1.6.1 + tslib: 2.6.2 + + /@azure/core-auth@1.9.0: + resolution: {integrity: sha512-FPwHpZywuyasDSLMqJ6fhbOK3TqUdviZNF8OqRGA4W5Ewib2lEEZ+pBsYcBa88B2NGO/SEnYPGhyBqNlE8ilSw==} + engines: {node: '>=18.0.0'} + dependencies: + '@azure/abort-controller': 2.1.2 + '@azure/core-util': 1.11.0 tslib: 2.6.2 /@azure/core-client@1.9.2: @@ -1952,9 +1977,9 @@ packages: dependencies: '@azure/abort-controller': 2.1.2 '@azure/core-auth': 1.5.0 - '@azure/core-rest-pipeline': 1.16.3 - '@azure/core-tracing': 1.1.2 - '@azure/core-util': 1.9.2 + '@azure/core-rest-pipeline': 1.17.0 + '@azure/core-tracing': 1.2.0 + '@azure/core-util': 1.6.1 '@azure/logger': 1.0.4 tslib: 2.6.2 transitivePeerDependencies: @@ -1966,7 +1991,7 @@ packages: dependencies: '@azure/abort-controller': 2.1.2 '@azure/core-client': 1.9.2 - '@azure/core-rest-pipeline': 1.16.3 + '@azure/core-rest-pipeline': 1.17.0 transitivePeerDependencies: - supports-color @@ -1975,7 +2000,7 @@ packages: engines: {node: '>=14.0.0'} dependencies: '@azure/abort-controller': 1.1.0 - '@azure/core-util': 1.9.2 + '@azure/core-util': 1.6.1 '@azure/logger': 1.0.4 tslib: 2.6.2 @@ -1985,14 +2010,14 @@ packages: dependencies: tslib: 2.6.2 - /@azure/core-rest-pipeline@1.16.3: - resolution: {integrity: sha512-VxLk4AHLyqcHsfKe4MZ6IQ+D+ShuByy+RfStKfSjxJoL3WBWq17VNmrz8aT8etKzqc2nAeIyLxScjpzsS4fz8w==} + /@azure/core-rest-pipeline@1.17.0: + resolution: {integrity: sha512-62Vv8nC+uPId3j86XJ0WI+sBf0jlqTqPUFCBNrGtlaUeQUIXWV/D8GE5A1d+Qx8H7OQojn2WguC8kChD6v0shA==} engines: {node: '>=18.0.0'} dependencies: '@azure/abort-controller': 2.1.2 - '@azure/core-auth': 1.5.0 - '@azure/core-tracing': 1.1.2 - '@azure/core-util': 1.9.2 + '@azure/core-auth': 1.9.0 + '@azure/core-tracing': 1.2.0 + '@azure/core-util': 1.11.0 '@azure/logger': 1.0.4 http-proxy-agent: 7.0.2 https-proxy-agent: 7.0.2 @@ -2006,24 +2031,31 @@ packages: dependencies: tslib: 2.6.2 - /@azure/core-tracing@1.1.2: - resolution: {integrity: sha512-dawW9ifvWAWmUm9/h+/UQ2jrdvjCJ7VJEuCJ6XVNudzcOwm53BFZH4Q845vjfgoUAM8ZxokvVNxNxAITc502YA==} + /@azure/core-tracing@1.2.0: + resolution: {integrity: sha512-UKTiEJPkWcESPYJz3X5uKRYyOcJD+4nYph+KpfdPRnQJVrZfk0KJgdnaAWKfhsBBtAf/D58Az4AvCJEmWgIBAg==} engines: {node: '>=18.0.0'} dependencies: tslib: 2.6.2 - /@azure/core-util@1.9.2: - resolution: {integrity: sha512-l1Qrqhi4x1aekkV+OlcqsJa4AnAkj5p0JV8omgwjaV9OAbP41lvrMvs+CptfetKkeEaGRGSzby7sjPZEX7+kkQ==} + /@azure/core-util@1.11.0: + resolution: {integrity: sha512-DxOSLua+NdpWoSqULhjDyAZTXFdP/LKkqtYuxxz1SCN289zk3OG8UOpnCQAz/tygyACBtWp/BoO72ptK7msY8g==} engines: {node: '>=18.0.0'} dependencies: '@azure/abort-controller': 2.1.2 tslib: 2.6.2 - /@azure/core-xml@1.4.3: - resolution: {integrity: sha512-D6G7FEmDiTctPKuWegX2WTrS1enKZwqYwdKTO6ZN6JMigcCehlT0/CYl+zWpI9vQ9frwwp7GQT3/owaEXgnOsA==} + /@azure/core-util@1.6.1: + resolution: {integrity: sha512-h5taHeySlsV9qxuK64KZxy4iln1BtMYlNt5jbuEFN3UFSAd1EwKg/Gjl5a6tZ/W8t6li3xPnutOx7zbDyXnPmQ==} + engines: {node: '>=16.0.0'} + dependencies: + '@azure/abort-controller': 1.1.0 + tslib: 2.6.2 + + /@azure/core-xml@1.4.4: + resolution: {integrity: sha512-J4FYAqakGXcbfeZjwjMzjNcpcH4E+JtEBv+xcV1yL0Ydn/6wbQfeFKTCHh9wttAi0lmajHw7yBbHPRG+YHckZQ==} engines: {node: '>=18.0.0'} dependencies: - fast-xml-parser: 4.4.1 + fast-xml-parser: 4.5.0 tslib: 2.6.2 /@azure/logger@1.0.4: @@ -2038,28 +2070,28 @@ packages: dependencies: '@azure-rest/core-client': 1.4.0 '@azure/core-auth': 1.5.0 - '@azure/core-rest-pipeline': 1.16.3 + '@azure/core-rest-pipeline': 1.17.0 '@azure/core-sse': 2.1.3 - '@azure/core-util': 1.9.2 + '@azure/core-util': 1.6.1 '@azure/logger': 1.0.4 tslib: 2.6.2 transitivePeerDependencies: - supports-color - /@azure/storage-blob@12.24.0: - resolution: {integrity: sha512-l8cmWM4C7RoNCBOImoFMxhTXe1Lr+8uQ/IgnhRNMpfoA9bAFWoLG4XrWm6O5rKXortreVQuD+fc1hbzWklOZbw==} + /@azure/storage-blob@12.25.0: + resolution: {integrity: sha512-oodouhA3nCCIh843tMMbxty3WqfNT+Vgzj3Xo5jqR9UPnzq3d7mzLjlHAYz7lW+b4km3SIgz+NAgztvhm7Z6kQ==} engines: {node: '>=18.0.0'} dependencies: - '@azure/abort-controller': 1.1.0 + '@azure/abort-controller': 2.1.2 '@azure/core-auth': 1.5.0 '@azure/core-client': 1.9.2 '@azure/core-http-compat': 2.1.2 '@azure/core-lro': 2.5.4 '@azure/core-paging': 1.5.0 - '@azure/core-rest-pipeline': 1.16.3 - '@azure/core-tracing': 1.1.2 - '@azure/core-util': 1.9.2 - '@azure/core-xml': 1.4.3 + '@azure/core-rest-pipeline': 1.17.0 + '@azure/core-tracing': 1.2.0 + '@azure/core-util': 1.6.1 + '@azure/core-xml': 1.4.4 '@azure/logger': 1.0.4 events: 3.3.0 tslib: 2.6.2 @@ -3718,7 +3750,7 @@ packages: - supports-color dev: true - /@comet/admin-date-time@7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): + /@comet/admin-date-time@7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): resolution: {integrity: sha512-DTtm4h1J1AaVoApJG6WpvgXesiVcSaa1eRqkaxScjc+Nav80Q0qAt7yNiAbnIJ7fl/8rmXqyXgtaWLwQondVNA==} peerDependencies: '@mui/material': ^5.0.0 @@ -3727,7 +3759,7 @@ packages: react-final-form: ^6.5.7 react-intl: ^5.0.0 || ^6.0.0 dependencies: - '@comet/admin': 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/admin': 7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/admin-icons': 7.5.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@mui/utils': 5.15.5(@types/react@17.0.75)(react@17.0.2) @@ -3767,7 +3799,7 @@ packages: use-constant: 1.1.1(react@17.0.2) uuid: 9.0.1 - /@comet/admin-rte@7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): + /@comet/admin-rte@7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): resolution: {integrity: sha512-rMlLzYYHjnHauB6Yc/T9YoiewRVwNXxn4z+nu8BdRXU8RnRjQFmCJ2Tsd2vWMTWrjLDc+oB+ZD85iCQrOAmv3Q==} peerDependencies: '@mui/material': ^5.0.0 @@ -3778,7 +3810,7 @@ packages: react-final-form: ^6.3.1 react-intl: ^5.0.0 || ^6.0.0 dependencies: - '@comet/admin': 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/admin': 7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/admin-icons': 7.5.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) detect-browser: 5.3.0 @@ -3823,7 +3855,7 @@ packages: - '@types/react' - react-dom - /@comet/admin@7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): + /@comet/admin@7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): resolution: {integrity: sha512-YTQd6NlRoLEf4YZ+4baI2k9ACo4lm6Xn244xxKSk1BGOb+QRAqQIlzgJwsxFuNfccE7vXlmgbZ3rCzpRUa/V6g==} peerDependencies: '@apollo/client': ^3.7.0 @@ -3851,7 +3883,7 @@ packages: react-dnd: optional: true dependencies: - '@apollo/client': 3.8.9(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) + '@apollo/client': 3.11.8(@types/react@17.0.75)(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) '@comet/admin-icons': 7.5.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) '@comet/admin-theme': 7.5.0(@mui/material@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@emotion/react': 11.11.3(@types/react@17.0.75)(react@17.0.2) @@ -3886,7 +3918,7 @@ packages: - '@mui/system' - '@types/react' - /@comet/blocks-admin@7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): + /@comet/blocks-admin@7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): resolution: {integrity: sha512-MKMxgxdgFWyw+F3pZIBCPvmgBXgyuPWnG89rPjAjOxBhHEop0qodMl5G/npM78a84uIZEXygE7cQQnRGQLzL9Q==} peerDependencies: '@mui/material': ^5.0.0 @@ -3898,7 +3930,7 @@ packages: react-router: ^5.0.0 react-router-dom: ^5.0.0 dependencies: - '@comet/admin': 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/admin': 7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/admin-icons': 7.5.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) '@mui/lab': 5.0.0-alpha.161(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) @@ -3949,7 +3981,7 @@ packages: ts-node: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) dev: true - /@comet/cms-admin@7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd-html5-backend@16.0.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): + /@comet/cms-admin@7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd-html5-backend@16.0.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2): resolution: {integrity: sha512-7XkhbcskROVlU5nuiZ/p8QNYt7VneO0NqmjSKAP3Wf/SljeAPj77Fs/qKT9QDtCkJauhIqlme2nESaWopixdpQ==} hasBin: true peerDependencies: @@ -3969,13 +4001,13 @@ packages: react-router: ^5.0.0 react-router-dom: ^5.0.0 dependencies: - '@apollo/client': 3.8.9(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) - '@comet/admin': 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) - '@comet/admin-date-time': 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@apollo/client': 3.11.8(@types/react@17.0.75)(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin': 7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/admin-date-time': 7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/admin-icons': 7.5.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) - '@comet/admin-rte': 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/admin-rte': 7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@comet/admin-theme': 7.5.0(@mui/material@5.15.5)(@mui/system@5.15.5)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) - '@comet/blocks-admin': 7.5.0(@apollo/client@3.8.9)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) + '@comet/blocks-admin': 7.5.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.15.5)(@mui/system@5.15.5)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.8.0)(history@4.10.1)(react-dnd@16.0.1)(react-dom@17.0.2)(react-final-form@6.5.9)(react-intl@5.25.1)(react-router-dom@5.3.4)(react-router@5.3.4)(react@17.0.2) '@emotion/react': 11.11.3(@types/react@17.0.75)(react@17.0.2) '@emotion/styled': 11.11.0(@emotion/react@11.11.3)(@types/react@17.0.75)(react@17.0.2) '@graphql-tools/graphql-file-loader': 7.5.17(graphql@15.8.0) @@ -4058,10 +4090,10 @@ packages: '@sentry/node': optional: true dependencies: - '@aws-sdk/client-s3': 3.637.0 + '@aws-sdk/client-s3': 3.682.0 '@azure-rest/ai-translation-text': 1.0.0 '@azure/openai': 1.0.0-beta.11 - '@azure/storage-blob': 12.24.0 + '@azure/storage-blob': 12.25.0 '@comet/blocks-api': 7.5.0(@nestjs/common@9.4.3) '@fast-csv/parse': 4.3.6 '@golevelup/nestjs-discovery': 3.0.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) @@ -4089,7 +4121,7 @@ packages: date-fns: 2.30.0 exifr: 7.1.3 express: 4.18.2 - fast-xml-parser: 4.4.1 + fast-xml-parser: 4.3.3 file-type: 16.5.4 get-image-colors: 4.0.1 got: 11.8.6 @@ -4125,7 +4157,7 @@ packages: - encoding - supports-color - /@comet/cms-site@7.5.0(@types/react@18.3.12)(next@14.2.7)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13): + /@comet/cms-site@7.5.0(@types/react@18.3.12)(next@14.2.16)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13): resolution: {integrity: sha512-IKBKIuXKVJaeI77ZMbCFOXc9Mpex9x1g3FrJdAMyy+/B7PHsvTyApDgF9LHyJ9JjfnN7lr/MQwCagzp25m5hUA==} peerDependencies: '@types/react': ^18.0.0 @@ -4135,8 +4167,8 @@ packages: styled-components: ^6.0.0 dependencies: '@types/react': 18.3.12 - jose: 5.8.0 - next: 14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) + jose: 5.9.6 + next: 14.2.16(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) rimraf: 3.0.2 @@ -4166,7 +4198,7 @@ packages: - debug dev: true - /@comet/eslint-config@7.5.0(eslint@8.56.0)(next@14.2.7)(prettier@2.8.8)(typescript@4.9.5): + /@comet/eslint-config@7.5.0(eslint@8.56.0)(next@14.2.16)(prettier@2.8.8)(typescript@4.9.5): resolution: {integrity: sha512-NEAP7IVgAjABUH0Cdv9NAlXbF9YzK+cI12Onr1vi6bDqwjVhb84S7VNl4pTlac1wAnDEuTbzTs/S6mBDQYxkyg==} peerDependencies: eslint: '>= 8' @@ -4178,11 +4210,11 @@ packages: dependencies: '@calm/eslint-plugin-react-intl': 1.4.1 '@comet/eslint-plugin': 7.5.0(eslint@8.56.0) - '@next/eslint-plugin-next': 14.2.7 + '@next/eslint-plugin-next': 14.2.16 '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@4.9.5) '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@4.9.5) eslint: 8.56.0 - eslint-config-next: 14.2.7(eslint@8.56.0)(typescript@4.9.5) + eslint-config-next: 14.2.16(eslint@8.56.0)(typescript@4.9.5) eslint-config-prettier: 8.10.0(eslint@8.56.0) eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.56.0) eslint-plugin-formatjs: 4.12.1(eslint@8.56.0)(ts-jest@29.1.1) @@ -4193,7 +4225,7 @@ packages: eslint-plugin-react-hooks: 4.6.0(eslint@8.56.0) eslint-plugin-simple-import-sort: 9.0.0(eslint@8.56.0) eslint-plugin-unused-imports: 2.0.0(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.56.0) - next: 14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) + next: 14.2.16(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) npm-run-all: 4.1.5 prettier: 2.8.8 transitivePeerDependencies: @@ -4216,11 +4248,11 @@ packages: dependencies: '@calm/eslint-plugin-react-intl': 1.4.1 '@comet/eslint-plugin': 7.5.0(eslint@8.56.0) - '@next/eslint-plugin-next': 14.2.7 + '@next/eslint-plugin-next': 14.2.16 '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@4.9.5) '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@4.9.5) eslint: 8.56.0 - eslint-config-next: 14.2.7(eslint@8.56.0)(typescript@4.9.5) + eslint-config-next: 14.2.16(eslint@8.56.0)(typescript@4.9.5) eslint-config-prettier: 8.10.0(eslint@8.56.0) eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.56.0) eslint-plugin-formatjs: 4.12.1(eslint@8.56.0)(ts-jest@27.1.5) @@ -4253,11 +4285,11 @@ packages: dependencies: '@calm/eslint-plugin-react-intl': 1.4.1 '@comet/eslint-plugin': 7.5.0(eslint@8.56.0) - '@next/eslint-plugin-next': 14.2.7 + '@next/eslint-plugin-next': 14.2.16 '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@4.9.5) '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@4.9.5) eslint: 8.56.0 - eslint-config-next: 14.2.7(eslint@8.56.0)(typescript@4.9.5) + eslint-config-next: 14.2.16(eslint@8.56.0)(typescript@4.9.5) eslint-config-prettier: 8.10.0(eslint@8.56.0) eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.56.0) eslint-plugin-formatjs: 4.12.1(eslint@8.56.0)(ts-jest@29.1.1) @@ -4514,8 +4546,8 @@ packages: /@floating-ui/utils@0.2.1: resolution: {integrity: sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==} - /@fontsource-variable/roboto-flex@5.0.16: - resolution: {integrity: sha512-aMJw0ac9M2fu78YUx5BRtdSqNqGV4cJPF6lbFpow8e0hXVH7wPwk5d0mpox1MTwvHFHRStmkYVB/SSUytmlaSw==} + /@fontsource-variable/roboto-flex@5.1.0: + resolution: {integrity: sha512-TwH8+uOwBqIjxtvTc+kp7ywyH7V7bDLbAXrEQg2SoCTJ6m2pn00x7ULioTTzDEvek+XpbqIf8gbKE1zlcONNGg==} dev: false /@formatjs/cli@3.2.0: @@ -6871,81 +6903,81 @@ packages: - utf-8-validate dev: false - /@next/env@14.2.7: - resolution: {integrity: sha512-OTx9y6I3xE/eih+qtthppwLytmpJVPM5PPoJxChFsbjIEFXIayG0h/xLzefHGJviAa3Q5+Fd+9uYojKkHDKxoQ==} + /@next/env@14.2.16: + resolution: {integrity: sha512-fLrX5TfJzHCbnZ9YUSnGW63tMV3L4nSfhgOQ0iCcX21Pt+VSTDuaLsSuL8J/2XAiVA5AnzvXDpf6pMs60QxOag==} - /@next/eslint-plugin-next@14.2.7: - resolution: {integrity: sha512-+7xh142AdhZGjY9/L0iFo7mqRBMJHe+q+uOL+hto1Lfo9DeWCGcR6no4StlFbVSVcA6fQLKEX6y6qhMsSKbgNQ==} + /@next/eslint-plugin-next@14.2.16: + resolution: {integrity: sha512-noORwKUMkKc96MWjTOwrsUCjky0oFegHbeJ1yEnQBGbMHAaTEIgLZIIfsYF0x3a06PiS+2TXppfifR+O6VWslg==} dependencies: glob: 10.3.10 dev: true - /@next/swc-darwin-arm64@14.2.7: - resolution: {integrity: sha512-UhZGcOyI9LE/tZL3h9rs/2wMZaaJKwnpAyegUVDGZqwsla6hMfeSj9ssBWQS9yA4UXun3pPhrFLVnw5KXZs3vw==} + /@next/swc-darwin-arm64@14.2.16: + resolution: {integrity: sha512-uFT34QojYkf0+nn6MEZ4gIWQ5aqGF11uIZ1HSxG+cSbj+Mg3+tYm8qXYd3dKN5jqKUm5rBVvf1PBRO/MeQ6rxw==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /@next/swc-darwin-x64@14.2.7: - resolution: {integrity: sha512-ys2cUgZYRc+CbyDeLAaAdZgS7N1Kpyy+wo0b/gAj+SeOeaj0Lw/q+G1hp+DuDiDAVyxLBCJXEY/AkhDmtihUTA==} + /@next/swc-darwin-x64@14.2.16: + resolution: {integrity: sha512-mCecsFkYezem0QiZlg2bau3Xul77VxUD38b/auAjohMA22G9KTJneUYMv78vWoCCFkleFAhY1NIvbyjj1ncG9g==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /@next/swc-linux-arm64-gnu@14.2.7: - resolution: {integrity: sha512-2xoWtE13sUJ3qrC1lwE/HjbDPm+kBQYFkkiVECJWctRASAHQ+NwjMzgrfqqMYHfMxFb5Wws3w9PqzZJqKFdWcQ==} + /@next/swc-linux-arm64-gnu@14.2.16: + resolution: {integrity: sha512-yhkNA36+ECTC91KSyZcgWgKrYIyDnXZj8PqtJ+c2pMvj45xf7y/HrgI17hLdrcYamLfVt7pBaJUMxADtPaczHA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@next/swc-linux-arm64-musl@14.2.7: - resolution: {integrity: sha512-+zJ1gJdl35BSAGpkCbfyiY6iRTaPrt3KTl4SF/B1NyELkqqnrNX6cp4IjjjxKpd64/7enI0kf6b9O1Uf3cL0pw==} + /@next/swc-linux-arm64-musl@14.2.16: + resolution: {integrity: sha512-X2YSyu5RMys8R2lA0yLMCOCtqFOoLxrq2YbazFvcPOE4i/isubYjkh+JCpRmqYfEuCVltvlo+oGfj/b5T2pKUA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@next/swc-linux-x64-gnu@14.2.7: - resolution: {integrity: sha512-m6EBqrskeMUzykBrv0fDX/28lWIBGhMzOYaStp0ihkjzIYJiKUOzVYD1gULHc8XDf5EMSqoH/0/TRAgXqpQwmw==} + /@next/swc-linux-x64-gnu@14.2.16: + resolution: {integrity: sha512-9AGcX7VAkGbc5zTSa+bjQ757tkjr6C/pKS7OK8cX7QEiK6MHIIezBLcQ7gQqbDW2k5yaqba2aDtaBeyyZh1i6Q==} engines: {node: '>= 10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@next/swc-linux-x64-musl@14.2.7: - resolution: {integrity: sha512-gUu0viOMvMlzFRz1r1eQ7Ql4OE+hPOmA7smfZAhn8vC4+0swMZaZxa9CSIozTYavi+bJNDZ3tgiSdMjmMzRJlQ==} + /@next/swc-linux-x64-musl@14.2.16: + resolution: {integrity: sha512-Klgeagrdun4WWDaOizdbtIIm8khUDQJ/5cRzdpXHfkbY91LxBXeejL4kbZBrpR/nmgRrQvmz4l3OtttNVkz2Sg==} engines: {node: '>= 10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@next/swc-win32-arm64-msvc@14.2.7: - resolution: {integrity: sha512-PGbONHIVIuzWlYmLvuFKcj+8jXnLbx4WrlESYlVnEzDsa3+Q2hI1YHoXaSmbq0k4ZwZ7J6sWNV4UZfx1OeOlbQ==} + /@next/swc-win32-arm64-msvc@14.2.16: + resolution: {integrity: sha512-PwW8A1UC1Y0xIm83G3yFGPiOBftJK4zukTmk7DI1CebyMOoaVpd8aSy7K6GhobzhkjYvqS/QmzcfsWG2Dwizdg==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /@next/swc-win32-ia32-msvc@14.2.7: - resolution: {integrity: sha512-BiSY5umlx9ed5RQDoHcdbuKTUkuFORDqzYKPHlLeS+STUWQKWziVOn3Ic41LuTBvqE0TRJPKpio9GSIblNR+0w==} + /@next/swc-win32-ia32-msvc@14.2.16: + resolution: {integrity: sha512-jhPl3nN0oKEshJBNDAo0etGMzv0j3q3VYorTSFqH1o3rwv1MQRdor27u1zhkgsHPNeY1jxcgyx1ZsCkDD1IHgg==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /@next/swc-win32-x64-msvc@14.2.7: - resolution: {integrity: sha512-pxsI23gKWRt/SPHFkDEsP+w+Nd7gK37Hpv0ngc5HpWy2e7cKx9zR/+Q2ptAUqICNTecAaGWvmhway7pj/JLEWA==} + /@next/swc-win32-x64-msvc@14.2.16: + resolution: {integrity: sha512-OA7NtfxgirCjfqt+02BqxC3MIgM/JaGjw9tOe4fyZgPsqfseNiMPnCRP44Pfs+Gpo9zPN+SXaFsgP6vk8d571A==} engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -8099,136 +8131,143 @@ packages: '@sinonjs/commons': 1.8.6 dev: true - /@smithy/abort-controller@3.1.1: - resolution: {integrity: sha512-MBJBiidoe+0cTFhyxT8g+9g7CeVccLM0IOKKUMCNQ1CNMJ/eIfoo0RTfVrXOONEI1UCN1W+zkiHSbzUNE9dZtQ==} + /@smithy/abort-controller@3.1.6: + resolution: {integrity: sha512-0XuhuHQlEqbNQZp7QxxrFTdVWdwxch4vjxYgfInF91hZFkPxf9QDrdQka0KfxFMPqLNzSw0b95uGTrLliQUavQ==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 3.3.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/chunked-blob-reader-native@3.0.0: - resolution: {integrity: sha512-VDkpCYW+peSuM4zJip5WDfqvg2Mo/e8yxOv3VF1m11y7B8KKMKVFtmZWDe36Fvk8rGuWrPZHHXZ7rR7uM5yWyg==} + /@smithy/chunked-blob-reader-native@3.0.1: + resolution: {integrity: sha512-VEYtPvh5rs/xlyqpm5NRnfYLZn+q0SRPELbvBV+C/G7IQ+ouTuo+NKKa3ShG5OaFR8NYVMXls9hPYLTvIKKDrQ==} dependencies: '@smithy/util-base64': 3.0.0 tslib: 2.6.2 - /@smithy/chunked-blob-reader@3.0.0: - resolution: {integrity: sha512-sbnURCwjF0gSToGlsBiAmd1lRCmSn72nu9axfJu5lIx6RUEgHu6GwTMbqCdhQSi0Pumcm5vFxsi9XWXb2mTaoA==} + /@smithy/chunked-blob-reader@4.0.0: + resolution: {integrity: sha512-jSqRnZvkT4egkq/7b6/QRCNXmmYVcHwnJldqJ3IhVpQE2atObVJ137xmGeuGFhjFUr8gCEVAOKwSY79OvpbDaQ==} dependencies: tslib: 2.6.2 - /@smithy/config-resolver@3.0.5: - resolution: {integrity: sha512-SkW5LxfkSI1bUC74OtfBbdz+grQXYiPYolyu8VfpLIjEoN/sHVBlLeGXMQ1vX4ejkgfv6sxVbQJ32yF2cl1veA==} + /@smithy/config-resolver@3.0.10: + resolution: {integrity: sha512-Uh0Sz9gdUuz538nvkPiyv1DZRX9+D15EKDtnQP5rYVAzM/dnYk3P8cg73jcxyOitPgT3mE3OVj7ky7sibzHWkw==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/node-config-provider': 3.1.4 - '@smithy/types': 3.3.0 + '@smithy/node-config-provider': 3.1.9 + '@smithy/types': 3.6.0 '@smithy/util-config-provider': 3.0.0 - '@smithy/util-middleware': 3.0.3 + '@smithy/util-middleware': 3.0.8 tslib: 2.6.2 - /@smithy/core@2.4.0: - resolution: {integrity: sha512-cHXq+FneIF/KJbt4q4pjN186+Jf4ZB0ZOqEaZMBhT79srEyGDDBV31NqBRBjazz8ppQ1bJbDJMY9ba5wKFV36w==} + /@smithy/core@2.5.1: + resolution: {integrity: sha512-DujtuDA7BGEKExJ05W5OdxCoyekcKT3Rhg1ZGeiUWaz2BJIWXjZmsG/DIP4W48GHno7AQwRsaCb8NcBgH3QZpg==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/middleware-endpoint': 3.1.0 - '@smithy/middleware-retry': 3.0.15 - '@smithy/middleware-serde': 3.0.3 - '@smithy/protocol-http': 4.1.0 - '@smithy/smithy-client': 3.2.0 - '@smithy/types': 3.3.0 + '@smithy/middleware-serde': 3.0.8 + '@smithy/protocol-http': 4.1.5 + '@smithy/types': 3.6.0 '@smithy/util-body-length-browser': 3.0.0 - '@smithy/util-middleware': 3.0.3 + '@smithy/util-middleware': 3.0.8 + '@smithy/util-stream': 3.2.1 '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 - /@smithy/credential-provider-imds@3.2.0: - resolution: {integrity: sha512-0SCIzgd8LYZ9EJxUjLXBmEKSZR/P/w6l7Rz/pab9culE/RWuqelAKGJvn5qUOl8BgX8Yj5HWM50A5hiB/RzsgA==} + /@smithy/credential-provider-imds@3.2.5: + resolution: {integrity: sha512-4FTQGAsuwqTzVMmiRVTn0RR9GrbRfkP0wfu/tXWVHd2LgNpTY0uglQpIScXK4NaEyXbB3JmZt8gfVqO50lP8wg==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/node-config-provider': 3.1.4 - '@smithy/property-provider': 3.1.3 - '@smithy/types': 3.3.0 - '@smithy/url-parser': 3.0.3 + '@smithy/node-config-provider': 3.1.9 + '@smithy/property-provider': 3.1.8 + '@smithy/types': 3.6.0 + '@smithy/url-parser': 3.0.8 tslib: 2.6.2 - /@smithy/eventstream-codec@3.1.2: - resolution: {integrity: sha512-0mBcu49JWt4MXhrhRAlxASNy0IjDRFU+aWNDRal9OtUJvJNiwDuyKMUONSOjLjSCeGwZaE0wOErdqULer8r7yw==} + /@smithy/eventstream-codec@3.1.7: + resolution: {integrity: sha512-kVSXScIiRN7q+s1x7BrQtZ1Aa9hvvP9FeCqCdBxv37GimIHgBCOnZ5Ip80HLt0DhnAKpiobFdGqTFgbaJNrazA==} dependencies: '@aws-crypto/crc32': 5.2.0 - '@smithy/types': 3.3.0 + '@smithy/types': 3.6.0 '@smithy/util-hex-encoding': 3.0.0 tslib: 2.6.2 - /@smithy/eventstream-serde-browser@3.0.6: - resolution: {integrity: sha512-2hM54UWQUOrki4BtsUI1WzmD13/SeaqT/AB3EUJKbcver/WgKNaiJ5y5F5XXuVe6UekffVzuUDrBZVAA3AWRpQ==} + /@smithy/eventstream-serde-browser@3.0.11: + resolution: {integrity: sha512-Pd1Wnq3CQ/v2SxRifDUihvpXzirJYbbtXfEnnLV/z0OGCTx/btVX74P86IgrZkjOydOASBGXdPpupYQI+iO/6A==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/eventstream-serde-universal': 3.0.5 - '@smithy/types': 3.3.0 + '@smithy/eventstream-serde-universal': 3.0.10 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/eventstream-serde-config-resolver@3.0.3: - resolution: {integrity: sha512-NVTYjOuYpGfrN/VbRQgn31x73KDLfCXCsFdad8DiIc3IcdxL+dYA9zEQPyOP7Fy2QL8CPy2WE4WCUD+ZsLNfaQ==} + /@smithy/eventstream-serde-config-resolver@3.0.8: + resolution: {integrity: sha512-zkFIG2i1BLbfoGQnf1qEeMqX0h5qAznzaZmMVNnvPZz9J5AWBPkOMckZWPedGUPcVITacwIdQXoPcdIQq5FRcg==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 3.3.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/eventstream-serde-node@3.0.5: - resolution: {integrity: sha512-+upXvnHNyZP095s11jF5dhGw/Ihzqwl5G+/KtMnoQOpdfC3B5HYCcDVG9EmgkhJMXJlM64PyN5gjJl0uXFQehQ==} + /@smithy/eventstream-serde-node@3.0.10: + resolution: {integrity: sha512-hjpU1tIsJ9qpcoZq9zGHBJPBOeBGYt+n8vfhDwnITPhEre6APrvqq/y3XMDEGUT2cWQ4ramNqBPRbx3qn55rhw==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/eventstream-serde-universal': 3.0.5 - '@smithy/types': 3.3.0 + '@smithy/eventstream-serde-universal': 3.0.10 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/eventstream-serde-universal@3.0.5: - resolution: {integrity: sha512-5u/nXbyoh1s4QxrvNre9V6vfyoLWuiVvvd5TlZjGThIikc3G+uNiG9uOTCWweSRjv1asdDIWK7nOmN7le4RYHQ==} + /@smithy/eventstream-serde-universal@3.0.10: + resolution: {integrity: sha512-ewG1GHbbqsFZ4asaq40KmxCmXO+AFSM1b+DcO2C03dyJj/ZH71CiTg853FSE/3SHK9q3jiYQIFjlGSwfxQ9kww==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/eventstream-codec': 3.1.2 - '@smithy/types': 3.3.0 + '@smithy/eventstream-codec': 3.1.7 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/fetch-http-handler@3.2.4: - resolution: {integrity: sha512-kBprh5Gs5h7ug4nBWZi1FZthdqSM+T7zMmsZxx0IBvWUn7dK3diz2SHn7Bs4dQGFDk8plDv375gzenDoNwrXjg==} + /@smithy/fetch-http-handler@3.2.9: + resolution: {integrity: sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A==} dependencies: - '@smithy/protocol-http': 4.1.0 - '@smithy/querystring-builder': 3.0.3 - '@smithy/types': 3.3.0 + '@smithy/protocol-http': 4.1.5 + '@smithy/querystring-builder': 3.0.8 + '@smithy/types': 3.6.0 '@smithy/util-base64': 3.0.0 tslib: 2.6.2 - /@smithy/hash-blob-browser@3.1.2: - resolution: {integrity: sha512-hAbfqN2UbISltakCC2TP0kx4LqXBttEv2MqSPE98gVuDFMf05lU+TpC41QtqGP3Ff5A3GwZMPfKnEy0VmEUpmg==} + /@smithy/fetch-http-handler@4.0.0: + resolution: {integrity: sha512-MLb1f5tbBO2X6K4lMEKJvxeLooyg7guq48C2zKr4qM7F2Gpkz4dc+hdSgu77pCJ76jVqFBjZczHYAs6dp15N+g==} dependencies: - '@smithy/chunked-blob-reader': 3.0.0 - '@smithy/chunked-blob-reader-native': 3.0.0 - '@smithy/types': 3.3.0 + '@smithy/protocol-http': 4.1.5 + '@smithy/querystring-builder': 3.0.8 + '@smithy/types': 3.6.0 + '@smithy/util-base64': 3.0.0 tslib: 2.6.2 - /@smithy/hash-node@3.0.3: - resolution: {integrity: sha512-2ctBXpPMG+B3BtWSGNnKELJ7SH9e4TNefJS0cd2eSkOOROeBnnVBnAy9LtJ8tY4vUEoe55N4CNPxzbWvR39iBw==} + /@smithy/hash-blob-browser@3.1.7: + resolution: {integrity: sha512-4yNlxVNJifPM5ThaA5HKnHkn7JhctFUHvcaz6YXxHlYOSIrzI6VKQPTN8Gs1iN5nqq9iFcwIR9THqchUCouIfg==} + dependencies: + '@smithy/chunked-blob-reader': 4.0.0 + '@smithy/chunked-blob-reader-native': 3.0.1 + '@smithy/types': 3.6.0 + tslib: 2.6.2 + + /@smithy/hash-node@3.0.8: + resolution: {integrity: sha512-tlNQYbfpWXHimHqrvgo14DrMAgUBua/cNoz9fMYcDmYej7MAmUcjav/QKQbFc3NrcPxeJ7QClER4tWZmfwoPng==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 3.3.0 + '@smithy/types': 3.6.0 '@smithy/util-buffer-from': 3.0.0 '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 - /@smithy/hash-stream-node@3.1.2: - resolution: {integrity: sha512-PBgDMeEdDzi6JxKwbfBtwQG9eT9cVwsf0dZzLXoJF4sHKHs5HEo/3lJWpn6jibfJwT34I1EBXpBnZE8AxAft6g==} + /@smithy/hash-stream-node@3.1.7: + resolution: {integrity: sha512-xMAsvJ3hLG63lsBVi1Hl6BBSfhd8/Qnp8fC06kjOpJvyyCEXdwHITa5Kvdsk6gaAXLhbZMhQMIGvgUbfnJDP6Q==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 3.3.0 + '@smithy/types': 3.6.0 '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 - /@smithy/invalid-dependency@3.0.3: - resolution: {integrity: sha512-ID1eL/zpDULmHJbflb864k72/SNOZCADRc9i7Exq3RUNJw6raWUSlFEQ+3PX3EYs++bTxZB2dE9mEHTQLv61tw==} + /@smithy/invalid-dependency@3.0.8: + resolution: {integrity: sha512-7Qynk6NWtTQhnGTTZwks++nJhQ1O54Mzi7fz4PqZOiYXb4Z1Flpb2yRvdALoggTS8xjtohWUM+RygOtB30YL3Q==} dependencies: - '@smithy/types': 3.3.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 /@smithy/is-array-buffer@2.0.0: @@ -8243,157 +8282,159 @@ packages: dependencies: tslib: 2.6.2 - /@smithy/md5-js@3.0.3: - resolution: {integrity: sha512-O/SAkGVwpWmelpj/8yDtsaVe6sINHLB1q8YE/+ZQbDxIw3SRLbTZuRaI10K12sVoENdnHqzPp5i3/H+BcZ3m3Q==} + /@smithy/md5-js@3.0.8: + resolution: {integrity: sha512-LwApfTK0OJ/tCyNUXqnWCKoE2b4rDSr4BJlDAVCkiWYeHESr+y+d5zlAanuLW6fnitVJRD/7d9/kN/ZM9Su4mA==} dependencies: - '@smithy/types': 3.3.0 + '@smithy/types': 3.6.0 '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 - /@smithy/middleware-content-length@3.0.5: - resolution: {integrity: sha512-ILEzC2eyxx6ncej3zZSwMpB5RJ0zuqH7eMptxC4KN3f+v9bqT8ohssKbhNR78k/2tWW+KS5Spw+tbPF4Ejyqvw==} + /@smithy/middleware-content-length@3.0.10: + resolution: {integrity: sha512-T4dIdCs1d/+/qMpwhJ1DzOhxCZjZHbHazEPJWdB4GDi2HjIZllVzeBEcdJUN0fomV8DURsgOyrbEUzg3vzTaOg==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/protocol-http': 4.1.0 - '@smithy/types': 3.3.0 + '@smithy/protocol-http': 4.1.5 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/middleware-endpoint@3.1.0: - resolution: {integrity: sha512-5y5aiKCEwg9TDPB4yFE7H6tYvGFf1OJHNczeY10/EFF8Ir8jZbNntQJxMWNfeQjC1mxPsaQ6mR9cvQbf+0YeMw==} + /@smithy/middleware-endpoint@3.2.1: + resolution: {integrity: sha512-wWO3xYmFm6WRW8VsEJ5oU6h7aosFXfszlz3Dj176pTij6o21oZnzkCLzShfmRaaCHDkBXWBdO0c4sQAvLFP6zA==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/middleware-serde': 3.0.3 - '@smithy/node-config-provider': 3.1.4 - '@smithy/shared-ini-file-loader': 3.1.4 - '@smithy/types': 3.3.0 - '@smithy/url-parser': 3.0.3 - '@smithy/util-middleware': 3.0.3 + '@smithy/core': 2.5.1 + '@smithy/middleware-serde': 3.0.8 + '@smithy/node-config-provider': 3.1.9 + '@smithy/shared-ini-file-loader': 3.1.9 + '@smithy/types': 3.6.0 + '@smithy/url-parser': 3.0.8 + '@smithy/util-middleware': 3.0.8 tslib: 2.6.2 - /@smithy/middleware-retry@3.0.15: - resolution: {integrity: sha512-iTMedvNt1ApdvkaoE8aSDuwaoc+BhvHqttbA/FO4Ty+y/S5hW6Ci/CTScG7vam4RYJWZxdTElc3MEfHRVH6cgQ==} + /@smithy/middleware-retry@3.0.25: + resolution: {integrity: sha512-m1F70cPaMBML4HiTgCw5I+jFNtjgz5z5UdGnUbG37vw6kh4UvizFYjqJGHvicfgKMkDL6mXwyPp5mhZg02g5sg==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/node-config-provider': 3.1.4 - '@smithy/protocol-http': 4.1.0 - '@smithy/service-error-classification': 3.0.3 - '@smithy/smithy-client': 3.2.0 - '@smithy/types': 3.3.0 - '@smithy/util-middleware': 3.0.3 - '@smithy/util-retry': 3.0.3 + '@smithy/node-config-provider': 3.1.9 + '@smithy/protocol-http': 4.1.5 + '@smithy/service-error-classification': 3.0.8 + '@smithy/smithy-client': 3.4.2 + '@smithy/types': 3.6.0 + '@smithy/util-middleware': 3.0.8 + '@smithy/util-retry': 3.0.8 tslib: 2.6.2 uuid: 9.0.1 - /@smithy/middleware-serde@3.0.3: - resolution: {integrity: sha512-puUbyJQBcg9eSErFXjKNiGILJGtiqmuuNKEYNYfUD57fUl4i9+mfmThtQhvFXU0hCVG0iEJhvQUipUf+/SsFdA==} + /@smithy/middleware-serde@3.0.8: + resolution: {integrity: sha512-Xg2jK9Wc/1g/MBMP/EUn2DLspN8LNt+GMe7cgF+Ty3vl+Zvu+VeZU5nmhveU+H8pxyTsjrAkci8NqY6OuvZnjA==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 3.3.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/middleware-stack@3.0.3: - resolution: {integrity: sha512-r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA==} + /@smithy/middleware-stack@3.0.8: + resolution: {integrity: sha512-d7ZuwvYgp1+3682Nx0MD3D/HtkmZd49N3JUndYWQXfRZrYEnCWYc8BHcNmVsPAp9gKvlurdg/mubE6b/rPS9MA==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 3.3.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/node-config-provider@3.1.4: - resolution: {integrity: sha512-YvnElQy8HR4vDcAjoy7Xkx9YT8xZP4cBXcbJSgm/kxmiQu08DwUwj8rkGnyoJTpfl/3xYHH+d8zE+eHqoDCSdQ==} + /@smithy/node-config-provider@3.1.9: + resolution: {integrity: sha512-qRHoah49QJ71eemjuS/WhUXB+mpNtwHRWQr77J/m40ewBVVwvo52kYAmb7iuaECgGTTcYxHS4Wmewfwy++ueew==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/property-provider': 3.1.3 - '@smithy/shared-ini-file-loader': 3.1.4 - '@smithy/types': 3.3.0 + '@smithy/property-provider': 3.1.8 + '@smithy/shared-ini-file-loader': 3.1.9 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/node-http-handler@3.1.4: - resolution: {integrity: sha512-+UmxgixgOr/yLsUxcEKGH0fMNVteJFGkmRltYFHnBMlogyFdpzn2CwqWmxOrfJELhV34v0WSlaqG1UtE1uXlJg==} + /@smithy/node-http-handler@3.2.5: + resolution: {integrity: sha512-PkOwPNeKdvX/jCpn0A8n9/TyoxjGZB8WVoJmm9YzsnAgggTj4CrjpRHlTQw7dlLZ320n1mY1y+nTRUDViKi/3w==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/abort-controller': 3.1.1 - '@smithy/protocol-http': 4.1.0 - '@smithy/querystring-builder': 3.0.3 - '@smithy/types': 3.3.0 + '@smithy/abort-controller': 3.1.6 + '@smithy/protocol-http': 4.1.5 + '@smithy/querystring-builder': 3.0.8 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/property-provider@3.1.3: - resolution: {integrity: sha512-zahyOVR9Q4PEoguJ/NrFP4O7SMAfYO1HLhB18M+q+Z4KFd4V2obiMnlVoUFzFLSPeVt1POyNWneHHrZaTMoc/g==} + /@smithy/property-provider@3.1.8: + resolution: {integrity: sha512-ukNUyo6rHmusG64lmkjFeXemwYuKge1BJ8CtpVKmrxQxc6rhUX0vebcptFA9MmrGsnLhwnnqeH83VTU9hwOpjA==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 3.3.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/protocol-http@4.1.0: - resolution: {integrity: sha512-dPVoHYQ2wcHooGXg3LQisa1hH0e4y0pAddPMeeUPipI1tEOqL6A4N0/G7abeq+K8wrwSgjk4C0wnD1XZpJm5aA==} + /@smithy/protocol-http@4.1.5: + resolution: {integrity: sha512-hsjtwpIemmCkm3ZV5fd/T0bPIugW1gJXwZ/hpuVubt2hEUApIoUTrf6qIdh9MAWlw0vjMrA1ztJLAwtNaZogvg==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 3.3.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/querystring-builder@3.0.3: - resolution: {integrity: sha512-vyWckeUeesFKzCDaRwWLUA1Xym9McaA6XpFfAK5qI9DKJ4M33ooQGqvM4J+LalH4u/Dq9nFiC8U6Qn1qi0+9zw==} + /@smithy/querystring-builder@3.0.8: + resolution: {integrity: sha512-btYxGVqFUARbUrN6VhL9c3dnSviIwBYD9Rz1jHuN1hgh28Fpv2xjU1HeCeDJX68xctz7r4l1PBnFhGg1WBBPuA==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 3.3.0 + '@smithy/types': 3.6.0 '@smithy/util-uri-escape': 3.0.0 tslib: 2.6.2 - /@smithy/querystring-parser@3.0.3: - resolution: {integrity: sha512-zahM1lQv2YjmznnfQsWbYojFe55l0SLG/988brlLv1i8z3dubloLF+75ATRsqPBboUXsW6I9CPGE5rQgLfY0vQ==} + /@smithy/querystring-parser@3.0.8: + resolution: {integrity: sha512-BtEk3FG7Ks64GAbt+JnKqwuobJNX8VmFLBsKIwWr1D60T426fGrV2L3YS5siOcUhhp6/Y6yhBw1PSPxA5p7qGg==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 3.3.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/service-error-classification@3.0.3: - resolution: {integrity: sha512-Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ==} + /@smithy/service-error-classification@3.0.8: + resolution: {integrity: sha512-uEC/kCCFto83bz5ZzapcrgGqHOh/0r69sZ2ZuHlgoD5kYgXJEThCoTuw/y1Ub3cE7aaKdznb+jD9xRPIfIwD7g==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 3.3.0 + '@smithy/types': 3.6.0 - /@smithy/shared-ini-file-loader@3.1.4: - resolution: {integrity: sha512-qMxS4hBGB8FY2GQqshcRUy1K6k8aBWP5vwm8qKkCT3A9K2dawUwOIJfqh9Yste/Bl0J2lzosVyrXDj68kLcHXQ==} + /@smithy/shared-ini-file-loader@3.1.9: + resolution: {integrity: sha512-/+OsJRNtoRbtsX0UpSgWVxFZLsJHo/4sTr+kBg/J78sr7iC+tHeOvOJrS5hCpVQ6sWBbhWLp1UNiuMyZhE6pmA==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 3.3.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/signature-v4@4.1.0: - resolution: {integrity: sha512-aRryp2XNZeRcOtuJoxjydO6QTaVhxx/vjaR+gx7ZjaFgrgPRyZ3HCTbfwqYj6ZWEBHkCSUfcaymKPURaByukag==} + /@smithy/signature-v4@4.2.1: + resolution: {integrity: sha512-NsV1jF4EvmO5wqmaSzlnTVetemBS3FZHdyc5CExbDljcyJCEEkJr8ANu2JvtNbVg/9MvKAWV44kTrGS+Pi4INg==} engines: {node: '>=16.0.0'} dependencies: '@smithy/is-array-buffer': 3.0.0 - '@smithy/protocol-http': 4.1.0 - '@smithy/types': 3.3.0 + '@smithy/protocol-http': 4.1.5 + '@smithy/types': 3.6.0 '@smithy/util-hex-encoding': 3.0.0 - '@smithy/util-middleware': 3.0.3 + '@smithy/util-middleware': 3.0.8 '@smithy/util-uri-escape': 3.0.0 '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 - /@smithy/smithy-client@3.2.0: - resolution: {integrity: sha512-pDbtxs8WOhJLJSeaF/eAbPgXg4VVYFlRcL/zoNYA5WbG3wBL06CHtBSg53ppkttDpAJ/hdiede+xApip1CwSLw==} + /@smithy/smithy-client@3.4.2: + resolution: {integrity: sha512-dxw1BDxJiY9/zI3cBqfVrInij6ShjpV4fmGHesGZZUiP9OSE/EVfdwdRz0PgvkEvrZHpsj2htRaHJfftE8giBA==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/middleware-endpoint': 3.1.0 - '@smithy/middleware-stack': 3.0.3 - '@smithy/protocol-http': 4.1.0 - '@smithy/types': 3.3.0 - '@smithy/util-stream': 3.1.3 + '@smithy/core': 2.5.1 + '@smithy/middleware-endpoint': 3.2.1 + '@smithy/middleware-stack': 3.0.8 + '@smithy/protocol-http': 4.1.5 + '@smithy/types': 3.6.0 + '@smithy/util-stream': 3.2.1 tslib: 2.6.2 - /@smithy/types@3.3.0: - resolution: {integrity: sha512-IxvBBCTFDHbVoK7zIxqA1ZOdc4QfM5HM7rGleCuHi7L1wnKv5Pn69xXJQ9hgxH60ZVygH9/JG0jRgtUncE3QUA==} + /@smithy/types@3.6.0: + resolution: {integrity: sha512-8VXK/KzOHefoC65yRgCn5vG1cysPJjHnOVt9d0ybFQSmJgQj152vMn4EkYhGuaOmnnZvCPav/KnYyE6/KsNZ2w==} engines: {node: '>=16.0.0'} dependencies: tslib: 2.6.2 - /@smithy/url-parser@3.0.3: - resolution: {integrity: sha512-pw3VtZtX2rg+s6HMs6/+u9+hu6oY6U7IohGhVNnjbgKy86wcIsSZwgHrFR+t67Uyxvp4Xz3p3kGXXIpTNisq8A==} + /@smithy/url-parser@3.0.8: + resolution: {integrity: sha512-4FdOhwpTW7jtSFWm7SpfLGKIBC9ZaTKG5nBF0wK24aoQKQyDIKUw3+KFWCQ9maMzrgTJIuOvOnsV2lLGW5XjTg==} dependencies: - '@smithy/querystring-parser': 3.0.3 - '@smithy/types': 3.3.0 + '@smithy/querystring-parser': 3.0.8 + '@smithy/types': 3.6.0 tslib: 2.6.2 /@smithy/util-base64@3.0.0: @@ -8435,34 +8476,34 @@ packages: dependencies: tslib: 2.6.2 - /@smithy/util-defaults-mode-browser@3.0.15: - resolution: {integrity: sha512-FZ4Psa3vjp8kOXcd3HJOiDPBCWtiilLl57r0cnNtq/Ga9RSDrM5ERL6xt+tO43+2af6Pn5Yp92x2n5vPuduNfg==} + /@smithy/util-defaults-mode-browser@3.0.25: + resolution: {integrity: sha512-fRw7zymjIDt6XxIsLwfJfYUfbGoO9CmCJk6rjJ/X5cd20+d2Is7xjU5Kt/AiDt6hX8DAf5dztmfP5O82gR9emA==} engines: {node: '>= 10.0.0'} dependencies: - '@smithy/property-provider': 3.1.3 - '@smithy/smithy-client': 3.2.0 - '@smithy/types': 3.3.0 + '@smithy/property-provider': 3.1.8 + '@smithy/smithy-client': 3.4.2 + '@smithy/types': 3.6.0 bowser: 2.11.0 tslib: 2.6.2 - /@smithy/util-defaults-mode-node@3.0.15: - resolution: {integrity: sha512-KSyAAx2q6d0t6f/S4XB2+3+6aQacm3aLMhs9aLMqn18uYGUepbdssfogW5JQZpc6lXNBnp0tEnR5e9CEKmEd7A==} + /@smithy/util-defaults-mode-node@3.0.25: + resolution: {integrity: sha512-H3BSZdBDiVZGzt8TG51Pd2FvFO0PAx/A0mJ0EH8a13KJ6iUCdYnw/Dk/MdC1kTd0eUuUGisDFaxXVXo4HHFL1g==} engines: {node: '>= 10.0.0'} dependencies: - '@smithy/config-resolver': 3.0.5 - '@smithy/credential-provider-imds': 3.2.0 - '@smithy/node-config-provider': 3.1.4 - '@smithy/property-provider': 3.1.3 - '@smithy/smithy-client': 3.2.0 - '@smithy/types': 3.3.0 + '@smithy/config-resolver': 3.0.10 + '@smithy/credential-provider-imds': 3.2.5 + '@smithy/node-config-provider': 3.1.9 + '@smithy/property-provider': 3.1.8 + '@smithy/smithy-client': 3.4.2 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/util-endpoints@2.0.5: - resolution: {integrity: sha512-ReQP0BWihIE68OAblC/WQmDD40Gx+QY1Ez8mTdFMXpmjfxSyz2fVQu3A4zXRfQU9sZXtewk3GmhfOHswvX+eNg==} + /@smithy/util-endpoints@2.1.4: + resolution: {integrity: sha512-kPt8j4emm7rdMWQyL0F89o92q10gvCUa6sBkBtDJ7nV2+P7wpXczzOfoDJ49CKXe5CCqb8dc1W+ZdLlrKzSAnQ==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/node-config-provider': 3.1.4 - '@smithy/types': 3.3.0 + '@smithy/node-config-provider': 3.1.9 + '@smithy/types': 3.6.0 tslib: 2.6.2 /@smithy/util-hex-encoding@3.0.0: @@ -8471,28 +8512,28 @@ packages: dependencies: tslib: 2.6.2 - /@smithy/util-middleware@3.0.3: - resolution: {integrity: sha512-l+StyYYK/eO3DlVPbU+4Bi06Jjal+PFLSMmlWM1BEwyLxZ3aKkf1ROnoIakfaA7mC6uw3ny7JBkau4Yc+5zfWw==} + /@smithy/util-middleware@3.0.8: + resolution: {integrity: sha512-p7iYAPaQjoeM+AKABpYWeDdtwQNxasr4aXQEA/OmbOaug9V0odRVDy3Wx4ci8soljE/JXQo+abV0qZpW8NX0yA==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 3.3.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/util-retry@3.0.3: - resolution: {integrity: sha512-AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w==} + /@smithy/util-retry@3.0.8: + resolution: {integrity: sha512-TCEhLnY581YJ+g1x0hapPz13JFqzmh/pMWL2KEFASC51qCfw3+Y47MrTmea4bUE5vsdxQ4F6/KFbUeSz22Q1ow==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/service-error-classification': 3.0.3 - '@smithy/types': 3.3.0 + '@smithy/service-error-classification': 3.0.8 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/util-stream@3.1.3: - resolution: {integrity: sha512-FIv/bRhIlAxC0U7xM1BCnF2aDRPq0UaelqBHkM2lsCp26mcBbgI0tCVTv+jGdsQLUmAMybua/bjDsSu8RQHbmw==} + /@smithy/util-stream@3.2.1: + resolution: {integrity: sha512-R3ufuzJRxSJbE58K9AEnL/uSZyVdHzud9wLS8tIbXclxKzoe09CRohj2xV8wpx5tj7ZbiJaKYcutMm1eYgz/0A==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/fetch-http-handler': 3.2.4 - '@smithy/node-http-handler': 3.1.4 - '@smithy/types': 3.3.0 + '@smithy/fetch-http-handler': 4.0.0 + '@smithy/node-http-handler': 3.2.5 + '@smithy/types': 3.6.0 '@smithy/util-base64': 3.0.0 '@smithy/util-buffer-from': 3.0.0 '@smithy/util-hex-encoding': 3.0.0 @@ -8519,12 +8560,12 @@ packages: '@smithy/util-buffer-from': 3.0.0 tslib: 2.6.2 - /@smithy/util-waiter@3.1.2: - resolution: {integrity: sha512-4pP0EV3iTsexDx+8PPGAKCQpd/6hsQBaQhqWzU4hqKPHN5epPsxKbvUTIiYIHTxaKt6/kEaqPBpu/ufvfbrRzw==} + /@smithy/util-waiter@3.1.7: + resolution: {integrity: sha512-d5yGlQtmN/z5eoTtIYgkvOw27US2Ous4VycnXatyoImIF9tzlcpnKqQ/V7qhvJmb2p6xZne1NopCLakdTnkBBQ==} engines: {node: '>=16.0.0'} dependencies: - '@smithy/abort-controller': 3.1.1 - '@smithy/types': 3.3.0 + '@smithy/abort-controller': 3.1.6 + '@smithy/types': 3.6.0 tslib: 2.6.2 /@swc/counter@0.1.3: @@ -9463,7 +9504,7 @@ packages: '@vue/shared': 3.4.14 estree-walker: 2.0.2 magic-string: 0.30.5 - postcss: 8.4.38 + postcss: 8.4.33 source-map-js: 1.0.2 dev: true @@ -10849,8 +10890,8 @@ packages: /caniuse-lite@1.0.30001578: resolution: {integrity: sha512-J/jkFgsQ3NEl4w2lCoM9ZPxrD+FoBNJ7uJUpGVjIg/j0OwJosWM36EPDv+Yyi0V4twBk9pPmlFS+PLykgEvUmg==} - /caniuse-lite@1.0.30001655: - resolution: {integrity: sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==} + /caniuse-lite@1.0.30001676: + resolution: {integrity: sha512-Qz6zwGCiPghQXGJvgQAem79esjitvJ+CxSbSQkW9H/UX5hg8XM88d4lp2W+MEQ81j+Hip58Il+jGVdazk1z9cw==} /capital-case@1.0.4: resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==} @@ -12343,8 +12384,8 @@ packages: source-map: 0.6.1 dev: true - /eslint-config-next@14.2.7(eslint@8.56.0)(typescript@4.9.5): - resolution: {integrity: sha512-ppmy+QdQ7qkuCHGDlPjWaoSbJvjGpWSBD4zEW8f1eWlxYXYpZK7QzBOer1EcHKT3uKhlY1JjUus9g7Kvv712rw==} + /eslint-config-next@14.2.16(eslint@8.56.0)(typescript@4.9.5): + resolution: {integrity: sha512-HOcnCJsyLXR7B8wmjaCgkTSpz+ijgOyAkP8OlvANvciP8PspBYFEBTmakNMxOf71fY0aKOm/blFIiKnrM4K03Q==} peerDependencies: eslint: ^7.23.0 || ^8.0.0 typescript: '>=3.3.1' @@ -12352,8 +12393,9 @@ packages: typescript: optional: true dependencies: - '@next/eslint-plugin-next': 14.2.7 + '@next/eslint-plugin-next': 14.2.16 '@rushstack/eslint-patch': 1.7.0 + '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.56.0)(typescript@4.9.5) '@typescript-eslint/parser': 5.62.0(eslint@8.56.0)(typescript@4.9.5) eslint: 8.56.0 eslint-import-resolver-node: 0.3.9 @@ -12983,12 +13025,24 @@ packages: punycode: 1.4.1 dev: true + /fast-xml-parser@4.3.3: + resolution: {integrity: sha512-coV/D1MhrShMvU6D0I+VAK3umz6hUaxxhL0yp/9RjfiYUfAv14rDhGQL+PLForhMdr0wq3PiV07WtkkNjJjNHg==} + hasBin: true + dependencies: + strnum: 1.0.5 + /fast-xml-parser@4.4.1: resolution: {integrity: sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==} hasBin: true dependencies: strnum: 1.0.5 + /fast-xml-parser@4.5.0: + resolution: {integrity: sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg==} + hasBin: true + dependencies: + strnum: 1.0.5 + /fastest-levenshtein@1.0.16: resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==} engines: {node: '>= 4.9.1'} @@ -14603,7 +14657,7 @@ packages: resolution: {integrity: sha512-v+AgVwiK5DsGtT9ng+m4mClp6zDAmwrW8nZi6Gg15qzvBnRWWdfWA1TGaXyCDnWq5g5asofIgMVl3PjKxvk1ug==} engines: {node: '>=6'} dependencies: - fast-xml-parser: 4.4.1 + fast-xml-parser: 4.3.3 /is-symbol@1.0.4: resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==} @@ -15700,8 +15754,8 @@ packages: /jose@4.15.4: resolution: {integrity: sha512-W+oqK4H+r5sITxfxpSU+MMdr/YSWGvgZMQDIsNoBDGGy4i7GBPTtvFKibQzW06n3U3TqHjhvBJsirShsEJ6eeQ==} - /jose@5.8.0: - resolution: {integrity: sha512-E7CqYpL/t7MMnfGnK/eg416OsFCVUrU/Y3Vwe7QjKhu/BkS1Ms455+2xsqZQVN57/U2MHMBvEb5SrmAZWAIntA==} + /jose@5.9.6: + resolution: {integrity: sha512-AMlnetc9+CV9asI19zHmrgS/WYsWUwCn2R7RzlbJWD7F9eWYUTGyBmU9o6PxngtLGOiDGPRu+Uc4fhKzbpteZQ==} dev: false /jpeg-js@0.4.4: @@ -17220,8 +17274,8 @@ packages: commander: 8.3.0 ora: 5.4.1 - /next@14.2.7(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1): - resolution: {integrity: sha512-4Qy2aK0LwH4eQiSvQWyKuC7JXE13bIopEQesWE0c/P3uuNRnZCQanI0vsrMLmUQJLAto+A+/8+sve2hd+BQuOQ==} + /next@14.2.16(@babel/core@7.23.7)(@opentelemetry/api@1.7.0)(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-LcO7WnFu6lYSvCzZoo1dB+IO0xXz5uEv52HF1IUN0IqVTUIZGHuuR10I5efiLadGt+4oZqTcNZyVVEem/TM5nA==} engines: {node: '>=18.17.0'} hasBin: true peerDependencies: @@ -17239,27 +17293,27 @@ packages: sass: optional: true dependencies: - '@next/env': 14.2.7 + '@next/env': 14.2.16 '@opentelemetry/api': 1.7.0 '@swc/helpers': 0.5.5 '@types/react': 18.3.12 busboy: 1.6.0 - caniuse-lite: 1.0.30001655 + caniuse-lite: 1.0.30001676 graceful-fs: 4.2.11 postcss: 8.4.31 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) styled-jsx: 5.1.1(@babel/core@7.23.7)(react@18.3.1) optionalDependencies: - '@next/swc-darwin-arm64': 14.2.7 - '@next/swc-darwin-x64': 14.2.7 - '@next/swc-linux-arm64-gnu': 14.2.7 - '@next/swc-linux-arm64-musl': 14.2.7 - '@next/swc-linux-x64-gnu': 14.2.7 - '@next/swc-linux-x64-musl': 14.2.7 - '@next/swc-win32-arm64-msvc': 14.2.7 - '@next/swc-win32-ia32-msvc': 14.2.7 - '@next/swc-win32-x64-msvc': 14.2.7 + '@next/swc-darwin-arm64': 14.2.16 + '@next/swc-darwin-x64': 14.2.16 + '@next/swc-linux-arm64-gnu': 14.2.16 + '@next/swc-linux-arm64-musl': 14.2.16 + '@next/swc-linux-x64-gnu': 14.2.16 + '@next/swc-linux-x64-musl': 14.2.16 + '@next/swc-win32-arm64-msvc': 14.2.16 + '@next/swc-win32-ia32-msvc': 14.2.16 + '@next/swc-win32-x64-msvc': 14.2.16 transitivePeerDependencies: - '@babel/core' - babel-plugin-macros @@ -18126,7 +18180,7 @@ packages: dependencies: nanoid: 3.3.7 picocolors: 1.0.0 - source-map-js: 1.2.0 + source-map-js: 1.0.2 /postcss@8.4.33: resolution: {integrity: sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==} @@ -18143,7 +18197,8 @@ packages: dependencies: nanoid: 3.3.7 picocolors: 1.0.0 - source-map-js: 1.2.0 + source-map-js: 1.2.1 + dev: false /postgres-array@2.0.0: resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==} @@ -18937,6 +18992,20 @@ packages: jsesc: 0.5.0 dev: true + /rehackt@0.1.0(@types/react@17.0.75)(react@17.0.2): + resolution: {integrity: sha512-7kRDOuLHB87D/JESKxQoRwv4DzbIdwkAGQ7p6QKGdVlY1IZheUnVhlk/4UZlNUVxdAXpyxikE3URsG067ybVzw==} + peerDependencies: + '@types/react': '*' + react: '*' + peerDependenciesMeta: + '@types/react': + optional: true + react: + optional: true + dependencies: + '@types/react': 17.0.75 + react: 17.0.2 + /relateurl@0.2.7: resolution: {integrity: sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==} engines: {node: '>= 0.10'} @@ -19132,7 +19201,6 @@ packages: /rimraf@2.7.1: resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==} - deprecated: Rimraf versions prior to v4 are no longer supported hasBin: true dependencies: glob: 7.2.3 @@ -19570,11 +19638,11 @@ packages: /source-map-js@1.0.2: resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} engines: {node: '>=0.10.0'} - dev: true - /source-map-js@1.2.0: - resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} + /source-map-js@1.2.1: + resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} engines: {node: '>=0.10.0'} + dev: false /source-map-support@0.5.13: resolution: {integrity: sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==} From 5105e4aea7c638b92d1ad45434c3d6053ff62eda Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Mon, 4 Nov 2024 10:34:26 +0100 Subject: [PATCH 44/45] Remove MR marker --- demo/api/.prettierignore | 4 ---- 1 file changed, 4 deletions(-) diff --git a/demo/api/.prettierignore b/demo/api/.prettierignore index 9bac5dcb..348889e4 100644 --- a/demo/api/.prettierignore +++ b/demo/api/.prettierignore @@ -1,7 +1,3 @@ dist/ block-meta.json -<<<<<<< HEAD -uploads -======= uploads/ ->>>>>>> next From 9fa549a18b4da47dff911097f59b294369af0a9c Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Mon, 4 Nov 2024 11:00:06 +0100 Subject: [PATCH 45/45] Fix file upload URL --- .../admin/src/common/contactImport/useContactImportFromCsv.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/admin/src/common/contactImport/useContactImportFromCsv.tsx b/packages/admin/src/common/contactImport/useContactImportFromCsv.tsx index 521da394..f833fcab 100644 --- a/packages/admin/src/common/contactImport/useContactImportFromCsv.tsx +++ b/packages/admin/src/common/contactImport/useContactImportFromCsv.tsx @@ -67,7 +67,7 @@ const ContactImportComponent = ({ scope, targetGroupId, fileInputRef, refetchQue const formData = new FormData(); formData.append("file", file); - const response = await fetch(`${config.apiUrl}/public-upload/files/upload`, { + const response = await fetch(`${config.apiUrl}/file-uploads/upload`, { method: "POST", body: formData, });