From 6d83768f1028f35027d2dff1392988034941a849 Mon Sep 17 00:00:00 2001 From: Vivid Planet Bot <56380013+vivid-planet-bot@users.noreply.github.com> Date: Tue, 3 Sep 2024 11:03:31 +0200 Subject: [PATCH 001/121] Merge main into next (#84) * Prevent invisible blocks from being included in the newsletter (#80) * Add workflow to merge main into next (#79) --------- Co-authored-by: Thomas Dax --- .changeset/moody-pumas-wash.md | 5 +++ .github/workflows/main-into-next-pr.yml | 45 +++++++++++++++++++ .../email-campaign/email-campaigns.service.ts | 5 ++- 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 .changeset/moody-pumas-wash.md create mode 100644 .github/workflows/main-into-next-pr.yml diff --git a/.changeset/moody-pumas-wash.md b/.changeset/moody-pumas-wash.md new file mode 100644 index 00000000..d18eb24c --- /dev/null +++ b/.changeset/moody-pumas-wash.md @@ -0,0 +1,5 @@ +--- +"@comet/brevo-api": patch +--- + +Prevent invisible blocks from being included in the newsletter diff --git a/.github/workflows/main-into-next-pr.yml b/.github/workflows/main-into-next-pr.yml new file mode 100644 index 00000000..4b0ff9be --- /dev/null +++ b/.github/workflows/main-into-next-pr.yml @@ -0,0 +1,45 @@ +name: Create "Merge main into next" PR +on: + push: + branches: + - main +jobs: + main-into-next: + name: Create "Merge main into next" PR + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 0 # Needed to also fetch next branch + + - name: Setup Git user + run: | + git config user.name github-actions + git config user.email github-actions@github.com + + - name: Try automatic merge of main into next + id: automatic-merge-attempt + continue-on-error: true + run: | + git checkout next + git merge main + echo 'PR_TITLE=Merge main into next' >> $GITHUB_ENV + echo 'PR_BODY=This is an automated pull request to merge changes from `main` into `next`.' >> $GITHUB_ENV + + - name: Merge with conflicts if automatic merge failed + if: steps.automatic-merge-attempt.outcome == 'failure' && steps.automatic-merge-attempt.conclusion == 'success' # https://docs.github.com/en/actions/learn-github-actions/contexts#steps-context + run: | + git add . + git commit -m "Merge main into next" + echo 'PR_TITLE=[Conflicts] Merge main into next' >> $GITHUB_ENV + echo 'PR_BODY=This is an automated pull request to merge changes from `main` into `next`. It has merge conflicts. To resolve conflicts, check out the branch `merge-main-into-next` locally, make any necessary changes to conflicting files, and commit and publish your changes.' >> $GITHUB_ENV + + - name: Create pull request + uses: peter-evans/create-pull-request@v6 + with: + token: ${{ secrets.VIVID_PLANET_BOT_TOKEN }} + title: ${{ env.PR_TITLE }} + body: ${{ env.PR_BODY }} + base: next + branch: merge-main-into-next diff --git a/packages/api/src/email-campaign/email-campaigns.service.ts b/packages/api/src/email-campaign/email-campaigns.service.ts index 5c90f732..a0f136fd 100644 --- a/packages/api/src/email-campaign/email-campaigns.service.ts +++ b/packages/api/src/email-campaign/email-campaigns.service.ts @@ -43,7 +43,10 @@ export class EmailCampaignsService { } async saveEmailCampaignInBrevo(campaign: EmailCampaignInterface, scheduledAt?: Date): Promise { - const content = await this.blockTransformerService.transformToPlain(campaign.content); + const content = await this.blockTransformerService.transformToPlain(campaign.content, { + includeInvisibleContent: false, + previewDamUrls: false, + }); const { data: htmlContent, status } = await this.httpService.axiosRef.post( this.config.emailCampaigns.frontend.url, From c13fe50dd2d80fb06768db240cde5607f4566ec5 Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Tue, 3 Sep 2024 16:01:10 +0200 Subject: [PATCH 002/121] Revert "Merge main into next (#84)" (#87) This reverts commit 6d83768f1028f35027d2dff1392988034941a849. --- .changeset/moody-pumas-wash.md | 5 --- .github/workflows/main-into-next-pr.yml | 45 ------------------- .../email-campaign/email-campaigns.service.ts | 5 +-- 3 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 .changeset/moody-pumas-wash.md delete mode 100644 .github/workflows/main-into-next-pr.yml diff --git a/.changeset/moody-pumas-wash.md b/.changeset/moody-pumas-wash.md deleted file mode 100644 index d18eb24c..00000000 --- a/.changeset/moody-pumas-wash.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@comet/brevo-api": patch ---- - -Prevent invisible blocks from being included in the newsletter diff --git a/.github/workflows/main-into-next-pr.yml b/.github/workflows/main-into-next-pr.yml deleted file mode 100644 index 4b0ff9be..00000000 --- a/.github/workflows/main-into-next-pr.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Create "Merge main into next" PR -on: - push: - branches: - - main -jobs: - main-into-next: - name: Create "Merge main into next" PR - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 # Needed to also fetch next branch - - - name: Setup Git user - run: | - git config user.name github-actions - git config user.email github-actions@github.com - - - name: Try automatic merge of main into next - id: automatic-merge-attempt - continue-on-error: true - run: | - git checkout next - git merge main - echo 'PR_TITLE=Merge main into next' >> $GITHUB_ENV - echo 'PR_BODY=This is an automated pull request to merge changes from `main` into `next`.' >> $GITHUB_ENV - - - name: Merge with conflicts if automatic merge failed - if: steps.automatic-merge-attempt.outcome == 'failure' && steps.automatic-merge-attempt.conclusion == 'success' # https://docs.github.com/en/actions/learn-github-actions/contexts#steps-context - run: | - git add . - git commit -m "Merge main into next" - echo 'PR_TITLE=[Conflicts] Merge main into next' >> $GITHUB_ENV - echo 'PR_BODY=This is an automated pull request to merge changes from `main` into `next`. It has merge conflicts. To resolve conflicts, check out the branch `merge-main-into-next` locally, make any necessary changes to conflicting files, and commit and publish your changes.' >> $GITHUB_ENV - - - name: Create pull request - uses: peter-evans/create-pull-request@v6 - with: - token: ${{ secrets.VIVID_PLANET_BOT_TOKEN }} - title: ${{ env.PR_TITLE }} - body: ${{ env.PR_BODY }} - base: next - branch: merge-main-into-next diff --git a/packages/api/src/email-campaign/email-campaigns.service.ts b/packages/api/src/email-campaign/email-campaigns.service.ts index a0f136fd..5c90f732 100644 --- a/packages/api/src/email-campaign/email-campaigns.service.ts +++ b/packages/api/src/email-campaign/email-campaigns.service.ts @@ -43,10 +43,7 @@ export class EmailCampaignsService { } async saveEmailCampaignInBrevo(campaign: EmailCampaignInterface, scheduledAt?: Date): Promise { - const content = await this.blockTransformerService.transformToPlain(campaign.content, { - includeInvisibleContent: false, - previewDamUrls: false, - }); + const content = await this.blockTransformerService.transformToPlain(campaign.content); const { data: htmlContent, status } = await this.httpService.axiosRef.post( this.config.emailCampaigns.frontend.url, From 925274e60d452460cdcdc3150212c0b8b160cf12 Mon Sep 17 00:00:00 2001 From: Denise Buder Date: Tue, 8 Oct 2024 13:31:57 +0200 Subject: [PATCH 003/121] Adapt import to upload files via public uploads module and get them from storage on import trigger --- demo/api/schema.gql | 9 +++ packages/api/generate-schema.ts | 7 +- packages/api/schema.gql | 9 +++ .../brevo-contact-import.controller.ts | 57 -------------- .../brevo-contact-import.resolver.ts | 77 +++++++++++++++++++ .../brevo-contact-import.service.ts | 17 +++- .../src/brevo-contact/brevo-contact.module.ts | 19 ++++- .../dto/brevo-contact-import.args.ts | 35 +++++++++ packages/api/src/config/config.ts | 6 ++ 9 files changed, 171 insertions(+), 65 deletions(-) delete mode 100644 packages/api/src/brevo-contact/brevo-contact-import.controller.ts create mode 100644 packages/api/src/brevo-contact/brevo-contact-import.resolver.ts create mode 100644 packages/api/src/brevo-contact/dto/brevo-contact-import.args.ts create mode 100644 packages/api/src/config/config.ts diff --git a/demo/api/schema.gql b/demo/api/schema.gql index 7e6a496b..faab9573 100644 --- a/demo/api/schema.gql +++ b/demo/api/schema.gql @@ -163,6 +163,14 @@ type PaginatedUserList { totalCount: Int! } +type CsvImportInformation { + created: Int! + updated: Int! + failed: Int! + failedColumns: [[String!]!] + errorMessage: String +} + type BrevoApiCampaignStatistics { """Number of unique clicks for the campaign""" uniqueClicks: Int! @@ -741,6 +749,7 @@ type Mutation { createBrevoContact(scope: EmailCampaignContentScopeInput!, input: BrevoContactInput!): SubscribeResponse! deleteBrevoContact(id: Int!, scope: EmailCampaignContentScopeInput!): Boolean! subscribeBrevoContact(input: SubscribeInput!, scope: EmailCampaignContentScopeInput!): SubscribeResponse! + startBrevoContactImport(fileId: ID!, targetGroupIds: [ID!], scope: EmailCampaignContentScopeInput!): CsvImportInformation! createEmailCampaign(scope: EmailCampaignContentScopeInput!, input: EmailCampaignInput!): EmailCampaign! updateEmailCampaign(id: ID!, input: EmailCampaignUpdateInput!, lastUpdatedAt: DateTime): EmailCampaign! deleteEmailCampaign(id: ID!): Boolean! diff --git a/packages/api/generate-schema.ts b/packages/api/generate-schema.ts index d2ffe2e3..46c4bb1e 100644 --- a/packages/api/generate-schema.ts +++ b/packages/api/generate-schema.ts @@ -7,6 +7,7 @@ import { writeFile } from "fs/promises"; import { printSchema } from "graphql"; import { createBrevoContactResolver } from "./src/brevo-contact/brevo-contact.resolver"; +import { createBrevoContactImportResolver } from "./src/brevo-contact/brevo-contact-import.resolver"; import { BrevoContactFactory } from "./src/brevo-contact/dto/brevo-contact.factory"; import { BrevoContactInputFactory } from "./src/brevo-contact/dto/brevo-contact-input.factory"; import { SubscribeInputFactory } from "./src/brevo-contact/dto/subscribe-input.factory"; @@ -69,6 +70,10 @@ async function generateSchema(): Promise { BrevoContactInput, BrevoContactUpdateInput, }); + const BrevoContactImportResolver = createBrevoContactImportResolver({ + BrevoContact, + Scope: EmailCampaignScope, + }); const TargetGroup = TargetGroupEntityFactory.create({ Scope: EmailCampaignScope }); const [TargetGroupInput, TargetGroupUpdateInput] = TargetGroupInputFactory.create({ BrevoFilterAttributes: BrevoContactFilterAttributes }); @@ -84,7 +89,7 @@ async function generateSchema(): Promise { Scope: EmailCampaignScope, }); - const schema = await gqlSchemaFactory.create([BrevoContactResolver, TargetGroupResolver, EmailCampaignResolver]); + const schema = await gqlSchemaFactory.create([BrevoContactResolver, TargetGroupResolver, EmailCampaignResolver, BrevoContactImportResolver]); await writeFile("schema.gql", printSchema(schema)); diff --git a/packages/api/schema.gql b/packages/api/schema.gql index 3777d1b4..ee8acb36 100644 --- a/packages/api/schema.gql +++ b/packages/api/schema.gql @@ -44,6 +44,14 @@ type User { language: String! } +type CsvImportInformation { + created: Int! + updated: Int! + failed: Int! + failedColumns: [[String!]!] + errorMessage: String +} + type BrevoApiCampaignStatistics { """Number of unique clicks for the campaign""" uniqueClicks: Int! @@ -254,6 +262,7 @@ type Mutation { deleteEmailCampaign(id: ID!): Boolean! sendEmailCampaignNow(id: ID!): Boolean! sendEmailCampaignToTestEmails(id: ID!, data: SendTestEmailCampaignArgs!): Boolean! + startBrevoContactImport(fileId: ID!, targetGroupIds: [ID!], scope: EmailCampaignContentScopeInput!): CsvImportInformation! } input BrevoContactUpdateInput { diff --git a/packages/api/src/brevo-contact/brevo-contact-import.controller.ts b/packages/api/src/brevo-contact/brevo-contact-import.controller.ts deleted file mode 100644 index 729894f5..00000000 --- a/packages/api/src/brevo-contact/brevo-contact-import.controller.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { CometValidationException, RequiredPermission } from "@comet/cms-api"; -import { Body, Controller, Inject, Post, Type, UploadedFile, UseInterceptors } from "@nestjs/common"; -import { FileInterceptor } from "@nestjs/platform-express"; -import { Readable } from "stream"; - -import { BrevoContactImportService } from "../brevo-contact/brevo-contact-import.service"; -import { BrevoModuleConfig } from "../config/brevo-module.config"; -import { BREVO_MODULE_CONFIG } from "../config/brevo-module.constants"; -import { EmailCampaignScopeInterface } from "../types"; -import { CsvImportInformation } from "./brevo-contact-import.service"; - -export function createBrevoContactImportController({ Scope }: { Scope: Type }): Type { - @Controller("brevo-contacts-csv") - class BrevoContactImportController { - constructor( - @Inject(BREVO_MODULE_CONFIG) private readonly config: BrevoModuleConfig, - @Inject(BrevoContactImportService) private readonly brevoContactImportService: BrevoContactImportService, - ) {} - - @Post("upload") - @UseInterceptors( - FileInterceptor("file", { - limits: { fileSize: 15 * 1024 * 1024 }, - fileFilter: (_, file, cb) => { - if (file.mimetype !== "text/csv") { - return cb(new CometValidationException(`Unsupported mime type: ${file.mimetype}`), false); - } - - return cb(null, true); - }, - }), - ) - @RequiredPermission(["brevo-newsletter"], { skipScopeCheck: true }) - async upload( - @UploadedFile() file: Express.Multer.File, - @Body("scope") scope: string, - @Body("listIds") listIds?: string, - ): Promise { - const parsedScope = JSON.parse(scope) as EmailCampaignScopeInterface; - const redirectUrl = this.config.brevo.resolveConfig(parsedScope).redirectUrlForImport; - - let targetGroupIds = undefined; - if (listIds) targetGroupIds = JSON.parse(listIds) as string[]; - - const stream = Readable.from(file.buffer); - return this.brevoContactImportService.importContactsFromCsv({ - fileStream: stream, - scope: parsedScope, - redirectUrl, - targetGroupIds, - isAdminImport: true, - }); - } - } - - return BrevoContactImportController; -} diff --git a/packages/api/src/brevo-contact/brevo-contact-import.resolver.ts b/packages/api/src/brevo-contact/brevo-contact-import.resolver.ts new file mode 100644 index 00000000..a9898091 --- /dev/null +++ b/packages/api/src/brevo-contact/brevo-contact-import.resolver.ts @@ -0,0 +1,77 @@ +import { BlobStorageBackendService, PublicUpload, RequiredPermission } from "@comet/cms-api"; +import { createHashedPath } from "@comet/cms-api/lib/dam/files/files.utils"; +import { EntityManager, EntityRepository } from "@mikro-orm/core"; +import { InjectRepository } from "@mikro-orm/nestjs"; +import { Inject, Type } from "@nestjs/common"; +import { Args, ArgsType, Mutation, Resolver } from "@nestjs/graphql"; +import { Readable } from "stream"; + +import { BrevoModuleConfig } from "../config/brevo-module.config"; +import { BREVO_MODULE_CONFIG } from "../config/brevo-module.constants"; +import { config } from "../config/config"; +import { EmailCampaignScopeInterface } from "../types"; +import { BrevoContactImportService, CsvImportInformation } from "./brevo-contact-import.service"; +import { BrevoContactInterface } from "./dto/brevo-contact.factory"; +import { BrevoContactImportArgsFactory } from "./dto/brevo-contact-import.args"; + +export function createBrevoContactImportResolver({ + Scope, + BrevoContact, +}: { + BrevoContact: Type; + Scope: Type; +}): Type { + @ArgsType() + class BrevoContactImportArgs extends BrevoContactImportArgsFactory.create({ Scope }) {} + + @Resolver(() => BrevoContact) + @RequiredPermission(["brevo-newsletter"], { skipScopeCheck: true }) + class BrevoContactImportResolver { + constructor( + @Inject(BREVO_MODULE_CONFIG) private readonly config: BrevoModuleConfig, + @Inject(BrevoContactImportService) private readonly brevoContactImportService: BrevoContactImportService, + private readonly storageService: BlobStorageBackendService, + @InjectRepository(PublicUpload) private readonly publicUploadRepository: EntityRepository, + private readonly entityManager: EntityManager, + ) {} + + @Mutation(() => CsvImportInformation) + async startBrevoContactImport(@Args() { fileId, targetGroupIds, scope }: BrevoContactImportArgs): Promise { + let storageFile: NodeJS.ReadableStream | null = null; + let objectName = null; + const publicUpload = await this.publicUploadRepository.findOne(fileId); + + if (publicUpload) { + objectName = createHashedPath(publicUpload.contentHash); + + if (await this.storageService.fileExists(config.brevoContactImportUploads.importDirectory, objectName)) { + storageFile = await this.storageService.getFile(config.brevoContactImportUploads.importDirectory, objectName); + } + } + + if (!storageFile || !objectName) { + throw new Error("File not found"); + } + + const redirectUrl = this.config.brevo.resolveConfig(scope).redirectUrlForImport; + + const result = await this.brevoContactImportService.importContactsFromCsv({ + fileStream: Readable.from(storageFile), + scope, + redirectUrl, + targetGroupIds, + }); + + if (await this.storageService.fileExists(config.brevoContactImportUploads.importDirectory, objectName)) { + await this.storageService.removeFile(config.brevoContactImportUploads.importDirectory, objectName); + await this.publicUploadRepository.nativeDelete({ id: fileId }); + } + + await this.entityManager.flush(); + + return result; + } + } + + return BrevoContactImportResolver; +} diff --git a/packages/api/src/brevo-contact/brevo-contact-import.service.ts b/packages/api/src/brevo-contact/brevo-contact-import.service.ts index dcd47750..b42e193e 100644 --- a/packages/api/src/brevo-contact/brevo-contact-import.service.ts +++ b/packages/api/src/brevo-contact/brevo-contact-import.service.ts @@ -2,6 +2,7 @@ import * as csv from "@fast-csv/parse"; import { EntityRepository } from "@mikro-orm/core"; import { InjectRepository } from "@mikro-orm/nestjs"; import { Inject, Injectable } from "@nestjs/common"; +import { Field, Int, ObjectType } from "@nestjs/graphql"; import { IsEmail, IsNotEmpty, validateSync } from "class-validator"; import isEqual from "lodash.isequal"; import { TargetGroupInterface } from "src/target-group/entity/target-group-entity.factory"; @@ -22,11 +23,21 @@ class BasicValidateableRow { [key: string]: string | string[]; } -export interface CsvImportInformation { +@ObjectType() +export class CsvImportInformation { + @Field(() => Int) created: number; + + @Field(() => Int) updated: number; + + @Field(() => Int) failed: number; - failedColumns: unknown[]; + + @Field(() => [[String]], { nullable: true }) + failedColumns: string[][]; + + @Field({ nullable: true }) errorMessage?: string; } @@ -55,7 +66,7 @@ export class BrevoContactImportService { targetGroupIds = [], isAdminImport = false, }: ImportContactsFromCsvParams): Promise { - const failedColumns: unknown[] = []; + const failedColumns: string[][] = []; const targetGroups = await this.targetGroupRepository.find({ id: { $in: targetGroupIds } }); for (const targetGroup of targetGroups) { diff --git a/packages/api/src/brevo-contact/brevo-contact.module.ts b/packages/api/src/brevo-contact/brevo-contact.module.ts index 385c573a..b0cd84dd 100644 --- a/packages/api/src/brevo-contact/brevo-contact.module.ts +++ b/packages/api/src/brevo-contact/brevo-contact.module.ts @@ -1,15 +1,17 @@ +import { PublicUpload, PublicUploadModule } from "@comet/cms-api"; import { MikroOrmModule } from "@mikro-orm/nestjs"; import { DynamicModule, Module, Type } from "@nestjs/common"; import { BrevoApiModule } from "../brevo-api/brevo-api.module"; import { createBrevoContactImportConsole } from "../brevo-contact/brevo-contact-import.console"; -import { createBrevoContactImportController } from "../brevo-contact/brevo-contact-import.controller"; import { BrevoContactImportService } from "../brevo-contact/brevo-contact-import.service"; +import { config } from "../config/config"; import { ConfigModule } from "../config/config.module"; import { TargetGroupInterface } from "../target-group/entity/target-group-entity.factory"; import { BrevoContactAttributesInterface, EmailCampaignScopeInterface } from "../types"; import { DeleteUnsubscribedBrevoContactsConsole } from "./brevo-contact.console"; import { createBrevoContactResolver } from "./brevo-contact.resolver"; +import { createBrevoContactImportResolver } from "./brevo-contact-import.resolver"; import { BrevoContactsService } from "./brevo-contacts.service"; import { BrevoContactFactory } from "./dto/brevo-contact.factory"; import { BrevoContactInputFactory } from "./dto/brevo-contact-input.factory"; @@ -37,22 +39,31 @@ export class BrevoContactModule { BrevoContactUpdateInput, }); + const BrevoContactImportResolver = createBrevoContactImportResolver({ Scope, BrevoContact }); const BrevoContactImportConsole = createBrevoContactImportConsole({ Scope }); - const BrevoContactImportController = createBrevoContactImportController({ Scope }); return { module: BrevoContactModule, - imports: [BrevoApiModule, ConfigModule, MikroOrmModule.forFeature([TargetGroup])], + imports: [ + BrevoApiModule, + ConfigModule, + MikroOrmModule.forFeature([TargetGroup, PublicUpload]), + PublicUploadModule.register({ + acceptedMimeTypes: ["text/csv"], + maxFileSize: config.brevoContactImportUploads.maxFileSize, + directory: config.brevoContactImportUploads.importDirectory, + }), + ], providers: [ BrevoContactImportService, BrevoContactsService, BrevoContactResolver, + BrevoContactImportResolver, EcgRtrListService, IsValidRedirectURLConstraint, DeleteUnsubscribedBrevoContactsConsole, BrevoContactImportConsole, ], - controllers: [BrevoContactImportController], exports: [BrevoContactsService, BrevoContactImportService], }; } diff --git a/packages/api/src/brevo-contact/dto/brevo-contact-import.args.ts b/packages/api/src/brevo-contact/dto/brevo-contact-import.args.ts new file mode 100644 index 00000000..67a1237b --- /dev/null +++ b/packages/api/src/brevo-contact/dto/brevo-contact-import.args.ts @@ -0,0 +1,35 @@ +import { IsUndefinable } from "@comet/cms-api"; +import { Type } from "@nestjs/common"; +import { ArgsType, Field, ID } from "@nestjs/graphql"; +import { Type as TransformerType } from "class-transformer"; +import { IsUUID, ValidateNested } from "class-validator"; + +import { EmailCampaignScopeInterface } from "../../types"; + +export interface BrevoContactImportArgsInterface { + scope: EmailCampaignScopeInterface; + fileId: string; + targetGroupIds?: Array; +} + +export class BrevoContactImportArgsFactory { + static create({ Scope }: { Scope: Type }) { + @ArgsType() + class BrevoContactImportArgs { + @Field(() => ID) + @IsUUID() + fileId: string; + + @Field(() => [ID], { nullable: true }) + @IsUndefinable() + targetGroupIds?: Array; + + @Field(() => Scope) + @TransformerType(() => Scope) + @ValidateNested() + scope: EmailCampaignScopeInterface; + } + + return BrevoContactImportArgs; + } +} diff --git a/packages/api/src/config/config.ts b/packages/api/src/config/config.ts new file mode 100644 index 00000000..57e63072 --- /dev/null +++ b/packages/api/src/config/config.ts @@ -0,0 +1,6 @@ +export const config = { + brevoContactImportUploads: { + maxFileSize: 1, + importDirectory: "brevo-contact-import/upload", + }, +}; From cb6e1bec826eb24b9548159067a55c556e40d7be Mon Sep 17 00:00:00 2001 From: Denise Buder Date: Tue, 8 Oct 2024 13:34:24 +0200 Subject: [PATCH 004/121] Add upload import file via rest and start import via graphql request --- .../useContactImportFromCsv.gql.ts | 13 +++++ .../contactImport/useContactImportFromCsv.tsx | 55 ++++++++++++------- 2 files changed, 49 insertions(+), 19 deletions(-) create mode 100644 packages/admin/src/common/contactImport/useContactImportFromCsv.gql.ts diff --git a/packages/admin/src/common/contactImport/useContactImportFromCsv.gql.ts b/packages/admin/src/common/contactImport/useContactImportFromCsv.gql.ts new file mode 100644 index 00000000..112adb5e --- /dev/null +++ b/packages/admin/src/common/contactImport/useContactImportFromCsv.gql.ts @@ -0,0 +1,13 @@ +import { gql } from "@apollo/client"; + +export const startBrevoContactImportMutation = gql` + mutation StartBrevoContactImport($scope: EmailCampaignContentScopeInput!, $fileId: ID!) { + startBrevoContactImport(scope: $scope, fileId: $fileId) { + created + updated + failed + failedColumns + errorMessage + } + } +`; diff --git a/packages/admin/src/common/contactImport/useContactImportFromCsv.tsx b/packages/admin/src/common/contactImport/useContactImportFromCsv.tsx index eed88ff8..d405f049 100644 --- a/packages/admin/src/common/contactImport/useContactImportFromCsv.tsx +++ b/packages/admin/src/common/contactImport/useContactImportFromCsv.tsx @@ -9,9 +9,11 @@ import * as React from "react"; import { useDropzone } from "react-dropzone"; import { FormattedMessage, useIntl } from "react-intl"; -import { GQLEmailCampaignContentScopeInput } from "../../graphql.generated"; +import { GQLCsvImportInformation, GQLEmailCampaignContentScopeInput } from "../../graphql.generated"; import { CrudMoreActionsItem } from "../../temp/CrudMoreActionsMenu"; import { useBrevoConfig } from "../BrevoConfigProvider"; +import { startBrevoContactImportMutation } from "./useContactImportFromCsv.gql"; +import { GQLStartBrevoContactImportMutation, GQLStartBrevoContactImportMutationVariables } from "./useContactImportFromCsv.gql.generated"; interface UseContactImportProps { scope: GQLEmailCampaignContentScopeInput; @@ -51,34 +53,51 @@ interface ComponentProps extends UseContactImportProps { fileInputRef: React.RefObject; } -interface ImportInformation { - failed: number; - created: number; - updated: number; - failedColumns: Record[]; - errorMessage?: string; -} - const ContactImportComponent = ({ scope, targetGroupId, fileInputRef, refetchQueries }: ComponentProps) => { const apolloClient = useApolloClient(); const [importingCsv, setImportingCsv] = React.useState(false); - const [importInformation, setImportInformation] = React.useState(null); + const [importInformation, setImportInformation] = React.useState(null); const dialogOpen = importingCsv || !!importInformation; const errorDialog = useErrorDialog(); const config = useBrevoConfig(); const intl = useIntl(); + const client = useApolloClient(); - function upload(file: File, scope: GQLEmailCampaignContentScopeInput, listIds?: string[]): Promise { + async function upload(file: File, scope: GQLEmailCampaignContentScopeInput, listIds?: string[]): Promise { const formData = new FormData(); formData.append("file", file); - formData.append("scope", JSON.stringify(scope)); - - if (listIds) formData.append("listIds", JSON.stringify(listIds)); - return fetch(`${config.apiUrl}/brevo-contacts-csv/upload`, { + const response = await fetch(`${config.apiUrl}/public-upload/files/upload`, { method: "POST", body: formData, }); + + if (!response.ok) { + throw new Error( + intl.formatMessage({ id: "cometBrevoModule.useContactImport.error.fileUpload", defaultMessage: "Could not upload file" }), + ); + } + + const publicUploadId = (await response.json()).id; + + const { data } = await client.mutate({ + mutation: startBrevoContactImportMutation, + variables: { + fileId: publicUploadId, + scope, + }, + }); + + if (!data) { + throw new Error( + intl.formatMessage({ + id: "cometBrevoModule.useContactImport.error.defaultMessage", + defaultMessage: + "An error occured during the import. Please try again in a while or contact your administrator if the error persists.", + }), + ); + } + return data.startBrevoContactImport; } const saveErrorFile = () => { @@ -117,12 +136,10 @@ const ContactImportComponent = ({ scope, targetGroupId, fileInputRef, refetchQue try { const file = acceptedFiles[0]; - const response = await upload(file, scope, targetGroupId ? [targetGroupId] : []); + const data = await upload(file, scope, targetGroupId ? [targetGroupId] : []); apolloClient.refetchQueries({ include: refetchQueries }); - const data = (await response.json()) as ImportInformation; - - if (response.ok) { + if (data) { setImportingCsv(false); if (data.errorMessage) { From 5901494721cc0d8e3e456c2b6fbb443904e36c03 Mon Sep 17 00:00:00 2001 From: Denise Buder Date: Tue, 15 Oct 2024 11:12:55 +0200 Subject: [PATCH 005/121] PublicUploadModule must be added to project's imports instead of brevo module since it is a global module --- demo/api/src/app.module.ts | 6 ++++++ demo/api/src/comet-config.json | 3 +++ .../brevo-contact-import.resolver.ts | 21 ++++++++++++------- .../src/brevo-contact/brevo-contact.module.ts | 14 ++----------- packages/api/src/brevo-module.ts | 18 +++++++++++++++- packages/api/src/config/config.ts | 6 ------ 6 files changed, 42 insertions(+), 26 deletions(-) delete mode 100644 packages/api/src/config/config.ts diff --git a/demo/api/src/app.module.ts b/demo/api/src/app.module.ts index 38b0765d..6df95ecf 100644 --- a/demo/api/src/app.module.ts +++ b/demo/api/src/app.module.ts @@ -12,6 +12,7 @@ import { KubernetesModule, PageTreeModule, PageTreeService, + PublicUploadModule, RedirectsModule, UserPermissionsModule, } from "@comet/cms-api"; @@ -136,6 +137,11 @@ export class AppModule { StatusModule, MenusModule, DependenciesModule, + PublicUploadModule.register({ + acceptedMimeTypes: ["text/csv"], + maxFileSize: config.publicUploads.maxFileSize, + directory: `${config.blob.storageDirectoryPrefix}-public-uploads`, + }), BrevoModule.register({ brevo: { resolveConfig: (scope: EmailCampaignContentScope) => { diff --git a/demo/api/src/comet-config.json b/demo/api/src/comet-config.json index a5e92f3e..43ff193e 100644 --- a/demo/api/src/comet-config.json +++ b/demo/api/src/comet-config.json @@ -8,5 +8,8 @@ "uploadsMaxFileSize": 500, "allowedImageSizes": [1200], "allowedImageAspectRatios": ["16x9", "4x3", "3x2", "3x1", "2x1", "1x1", "1x2", "1x3", "2x3", "3x4", "9x16"] + }, + "publicUploads": { + "maxFileSize": 15 } } 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 a9898091..f81ebdab 100644 --- a/packages/api/src/brevo-contact/brevo-contact-import.resolver.ts +++ b/packages/api/src/brevo-contact/brevo-contact-import.resolver.ts @@ -1,14 +1,16 @@ import { BlobStorageBackendService, PublicUpload, RequiredPermission } from "@comet/cms-api"; import { createHashedPath } from "@comet/cms-api/lib/dam/files/files.utils"; +import { PublicUploadConfig } from "@comet/cms-api/lib/public-upload/public-upload.config"; +import { PUBLIC_UPLOAD_CONFIG } from "@comet/cms-api/lib/public-upload/public-upload.constants"; import { EntityManager, EntityRepository } from "@mikro-orm/core"; import { InjectRepository } from "@mikro-orm/nestjs"; import { Inject, Type } from "@nestjs/common"; +import { ModuleRef } from "@nestjs/core"; import { Args, ArgsType, Mutation, Resolver } from "@nestjs/graphql"; import { Readable } from "stream"; import { BrevoModuleConfig } from "../config/brevo-module.config"; import { BREVO_MODULE_CONFIG } from "../config/brevo-module.constants"; -import { config } from "../config/config"; import { EmailCampaignScopeInterface } from "../types"; import { BrevoContactImportService, CsvImportInformation } from "./brevo-contact-import.service"; import { BrevoContactInterface } from "./dto/brevo-contact.factory"; @@ -27,13 +29,18 @@ export function createBrevoContactImportResolver({ @Resolver(() => BrevoContact) @RequiredPermission(["brevo-newsletter"], { skipScopeCheck: true }) class BrevoContactImportResolver { + private publicUploadsConfig: PublicUploadConfig; + constructor( @Inject(BREVO_MODULE_CONFIG) private readonly config: BrevoModuleConfig, @Inject(BrevoContactImportService) private readonly brevoContactImportService: BrevoContactImportService, - private readonly storageService: BlobStorageBackendService, @InjectRepository(PublicUpload) private readonly publicUploadRepository: EntityRepository, + private readonly storageService: BlobStorageBackendService, + private readonly moduleRef: ModuleRef, private readonly entityManager: EntityManager, - ) {} + ) { + this.publicUploadsConfig = this.moduleRef.get(PUBLIC_UPLOAD_CONFIG, { strict: false }); + } @Mutation(() => CsvImportInformation) async startBrevoContactImport(@Args() { fileId, targetGroupIds, scope }: BrevoContactImportArgs): Promise { @@ -44,8 +51,8 @@ export function createBrevoContactImportResolver({ if (publicUpload) { objectName = createHashedPath(publicUpload.contentHash); - if (await this.storageService.fileExists(config.brevoContactImportUploads.importDirectory, objectName)) { - storageFile = await this.storageService.getFile(config.brevoContactImportUploads.importDirectory, objectName); + if (await this.storageService.fileExists(this.publicUploadsConfig.directory, objectName)) { + storageFile = await this.storageService.getFile(this.publicUploadsConfig.directory, objectName); } } @@ -62,8 +69,8 @@ export function createBrevoContactImportResolver({ targetGroupIds, }); - if (await this.storageService.fileExists(config.brevoContactImportUploads.importDirectory, objectName)) { - await this.storageService.removeFile(config.brevoContactImportUploads.importDirectory, objectName); + if (await this.storageService.fileExists(this.publicUploadsConfig.directory, objectName)) { + await this.storageService.removeFile(this.publicUploadsConfig.directory, objectName); await this.publicUploadRepository.nativeDelete({ id: fileId }); } diff --git a/packages/api/src/brevo-contact/brevo-contact.module.ts b/packages/api/src/brevo-contact/brevo-contact.module.ts index b0cd84dd..4dde49cf 100644 --- a/packages/api/src/brevo-contact/brevo-contact.module.ts +++ b/packages/api/src/brevo-contact/brevo-contact.module.ts @@ -1,11 +1,10 @@ -import { PublicUpload, PublicUploadModule } from "@comet/cms-api"; +import { PublicUpload } from "@comet/cms-api"; import { MikroOrmModule } from "@mikro-orm/nestjs"; import { DynamicModule, Module, Type } from "@nestjs/common"; import { BrevoApiModule } from "../brevo-api/brevo-api.module"; import { createBrevoContactImportConsole } from "../brevo-contact/brevo-contact-import.console"; import { BrevoContactImportService } from "../brevo-contact/brevo-contact-import.service"; -import { config } from "../config/config"; import { ConfigModule } from "../config/config.module"; import { TargetGroupInterface } from "../target-group/entity/target-group-entity.factory"; import { BrevoContactAttributesInterface, EmailCampaignScopeInterface } from "../types"; @@ -44,16 +43,7 @@ export class BrevoContactModule { return { module: BrevoContactModule, - imports: [ - BrevoApiModule, - ConfigModule, - MikroOrmModule.forFeature([TargetGroup, PublicUpload]), - PublicUploadModule.register({ - acceptedMimeTypes: ["text/csv"], - maxFileSize: config.brevoContactImportUploads.maxFileSize, - directory: config.brevoContactImportUploads.importDirectory, - }), - ], + imports: [BrevoApiModule, ConfigModule, MikroOrmModule.forFeature([TargetGroup, PublicUpload])], providers: [ BrevoContactImportService, BrevoContactsService, diff --git a/packages/api/src/brevo-module.ts b/packages/api/src/brevo-module.ts index bfbd53ad..be99b038 100644 --- a/packages/api/src/brevo-module.ts +++ b/packages/api/src/brevo-module.ts @@ -1,4 +1,8 @@ -import { DynamicModule, Global, Module } from "@nestjs/common"; +import { PublicUploadsService } from "@comet/cms-api"; +import { PublicUploadConfig } from "@comet/cms-api/lib/public-upload/public-upload.config"; +import { PUBLIC_UPLOAD_CONFIG } from "@comet/cms-api/lib/public-upload/public-upload.constants"; +import { DynamicModule, Global, Module, Optional } from "@nestjs/common"; +import { ModuleRef } from "@nestjs/core"; import { BrevoApiModule } from "./brevo-api/brevo-api.module"; import { BrevoContactModule } from "./brevo-contact/brevo-contact.module"; @@ -11,6 +15,18 @@ import { TargetGroupModule } from "./target-group/target-group.module"; @Global() @Module({}) export class BrevoModule { + constructor(private readonly moduleRef: ModuleRef, @Optional() private readonly myGlobalService: PublicUploadsService) { + let publicUploadsConfig: PublicUploadConfig | undefined; + try { + publicUploadsConfig = this.moduleRef.get(PUBLIC_UPLOAD_CONFIG, { strict: false }); + } catch (error) { + throw new Error("PublicUploadModule is an required import for BrevoModule"); + } + + if (publicUploadsConfig && !publicUploadsConfig.acceptedMimeTypes.includes("text/csv")) { + throw new Error("BrevoModule requires mime type 'text/csv' in PublicUploadModule's config"); + } + } static register(config: BrevoModuleConfig): DynamicModule { const TargetGroup = TargetGroupEntityFactory.create({ Scope: config.emailCampaigns.Scope, diff --git a/packages/api/src/config/config.ts b/packages/api/src/config/config.ts deleted file mode 100644 index 57e63072..00000000 --- a/packages/api/src/config/config.ts +++ /dev/null @@ -1,6 +0,0 @@ -export const config = { - brevoContactImportUploads: { - maxFileSize: 1, - importDirectory: "brevo-contact-import/upload", - }, -}; From 942e4d2644c1829f96004b8044e859922e54eb0d Mon Sep 17 00:00:00 2001 From: Denise Buder Date: Tue, 15 Oct 2024 11:13:12 +0200 Subject: [PATCH 006/121] Add uploads to .prettierignore --- demo/api/.prettierignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/demo/api/.prettierignore b/demo/api/.prettierignore index fe35c774..d197f481 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 From d5f3ff4658c8bee0f74132ef5ceabfb358140f10 Mon Sep 17 00:00:00 2001 From: Denise Buder Date: Tue, 15 Oct 2024 13:52:14 +0200 Subject: [PATCH 007/121] Delete uploaded file in case of error --- .../brevo-contact-import.resolver.ts | 57 ++++++++++++------- 1 file changed, 35 insertions(+), 22 deletions(-) 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 f81ebdab..f3212b8a 100644 --- a/packages/api/src/brevo-contact/brevo-contact-import.resolver.ts +++ b/packages/api/src/brevo-contact/brevo-contact-import.resolver.ts @@ -46,37 +46,50 @@ export function createBrevoContactImportResolver({ async startBrevoContactImport(@Args() { fileId, targetGroupIds, scope }: BrevoContactImportArgs): Promise { let storageFile: NodeJS.ReadableStream | null = null; let objectName = null; - const publicUpload = await this.publicUploadRepository.findOne(fileId); - if (publicUpload) { - objectName = createHashedPath(publicUpload.contentHash); + try { + const publicUpload = await this.publicUploadRepository.findOne(fileId); - if (await this.storageService.fileExists(this.publicUploadsConfig.directory, objectName)) { - storageFile = await this.storageService.getFile(this.publicUploadsConfig.directory, objectName); + if (publicUpload) { + objectName = createHashedPath(publicUpload.contentHash); + + if (await this.storageService.fileExists(this.publicUploadsConfig.directory, objectName)) { + storageFile = await this.storageService.getFile(this.publicUploadsConfig.directory, objectName); + } } - } - if (!storageFile || !objectName) { - throw new Error("File not found"); - } + if (!storageFile || !objectName) { + throw new Error("File not found"); + } - const redirectUrl = this.config.brevo.resolveConfig(scope).redirectUrlForImport; + const redirectUrl = this.config.brevo.resolveConfig(scope).redirectUrlForImport; - const result = await this.brevoContactImportService.importContactsFromCsv({ - fileStream: Readable.from(storageFile), - scope, - redirectUrl, - targetGroupIds, - }); + const result = await this.brevoContactImportService.importContactsFromCsv({ + fileStream: Readable.from(storageFile), + scope, + redirectUrl, + targetGroupIds, + }); - if (await this.storageService.fileExists(this.publicUploadsConfig.directory, objectName)) { - await this.storageService.removeFile(this.publicUploadsConfig.directory, objectName); - await this.publicUploadRepository.nativeDelete({ id: fileId }); - } + if (await this.storageService.fileExists(this.publicUploadsConfig.directory, objectName)) { + await this.storageService.removeFile(this.publicUploadsConfig.directory, objectName); + await this.publicUploadRepository.nativeDelete({ id: fileId }); + } + + await this.entityManager.flush(); - await this.entityManager.flush(); + return result; + } catch (error) { + // in case of error always delete the uploaded file + if (objectName && (await this.storageService.fileExists(this.publicUploadsConfig.directory, objectName))) { + await this.storageService.removeFile(this.publicUploadsConfig.directory, objectName); + await this.publicUploadRepository.nativeDelete({ id: fileId }); + } + + await this.entityManager.flush(); - return result; + throw error; + } } } From adb69fd0a6816ab8c67ac3bf86b9fc5cca5329f2 Mon Sep 17 00:00:00 2001 From: Denise Buder Date: Wed, 16 Oct 2024 09:02:25 +0200 Subject: [PATCH 008/121] Add changeset --- .changeset/many-lamps-move.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .changeset/many-lamps-move.md diff --git a/.changeset/many-lamps-move.md b/.changeset/many-lamps-move.md new file mode 100644 index 00000000..10066f57 --- /dev/null +++ b/.changeset/many-lamps-move.md @@ -0,0 +1,19 @@ +--- +"@comet/brevo-admin": major +"@comet/brevo-api": major +--- + +Refactor brevo contact import to upload files to public uploads temporarily + +The files for the brevo contact import now get temporarily stored in the public uploads until the import is concluded. +This change prepares for future imports to be handled in a separate job, allowing more than 100 contacts to be imported without exhausting api resources or blocking the event loop. + +It is now necessary to import the `PublicUploadsModule` in the project's `AppModule` and configure it to accept csv files. + +```ts + PublicUploadModule.register({ + acceptedMimeTypes: ["text/csv"], + maxFileSize: config.publicUploads.maxFileSize, + directory: `${config.blob.storageDirectoryPrefix}-public-uploads`, + }), +``` From 0db9f4aa7a028c56306fef977fb268c67450ae6c Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Tue, 5 Nov 2024 09:36:07 +0100 Subject: [PATCH 009/121] Update to COMET v7 (#81) Update from COMET v6 to v7 **Breaking Changes**: - 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) No changes to the public API were necessary ### Note - The Demo API currently contains a workaround for a COMET bug that can be removed in the future (https://github.com/vivid-planet/comet-brevo-module/commit/9bce002dcf656fad122f1fd11e6ec5220ce16a81) - In the campaign it was necessary to migrate from the deprecated `mjml-react@2` to the maintained fork `@faire/mjml-react@3`. This was necessary because v2 doesn't support React 18 (but is a good thing anyway). Since [v3](https://github.com/Faire/mjml-react/releases/tag/v3.0.0) doesn't have impactful breaking changes, the migration shouldn't be a problem. --- .changeset/fast-weeks-remember.md | 10 + .env | 3 - demo/admin/.prettierignore | 3 +- demo/admin/package.json | 22 +- demo/admin/server/package-lock.json | 144 +- demo/admin/src/App.tsx | 57 +- demo/admin/src/Routes.tsx | 19 +- .../admin/src/common/ContentScopeProvider.tsx | 41 +- demo/admin/src/common/MasterHeader.tsx | 4 +- .../brevoContactsPageAttributesConfig.tsx | 3 +- demo/admin/src/documents/links/EditLink.tsx | 10 +- demo/admin/src/documents/pages/EditPage.tsx | 16 +- .../pages/blocks/PageContentBlock.tsx | 4 +- demo/admin/src/theme.ts | 6 - demo/admin/src/vendors.d.ts | 2 + demo/api/.prettierignore | 2 +- demo/api/block-meta.json | 219 +- demo/api/package.json | 19 +- demo/api/schema.gql | 36 +- demo/api/src/app.module.ts | 54 +- demo/api/src/auth/auth-local.module.ts | 1 - demo/api/src/auth/auth.module.ts | 3 +- .../brevo-contact-subscribe.controller.ts | 4 +- .../brevo-transactional-mails.controller.ts | 4 +- demo/api/src/comet-config.json | 3 +- .../pages/blocks/page-content.block.ts | 4 +- demo/api/src/status/status.controller.ts | 4 +- .../file-upload/file-upload-dummy.module.ts | 9 + .../file-upload/file-upload-dummy.resolver.ts | 13 + demo/campaign/next.config.js | 3 + demo/campaign/package.json | 20 +- .../src/common/blocks/DamImageBlock.tsx | 4 +- .../src/common/blocks/HeadlineBlock.tsx | 6 +- demo/campaign/src/common/blocks/LinkBlock.tsx | 12 +- .../src/common/blocks/RichTextBlock.tsx | 2 +- demo/campaign/src/components/Root.tsx | 2 +- demo/campaign/src/documents/pages/Page.tsx | 6 +- .../src/documents/pages/blocks/SeoBlock.tsx | 38 +- demo/campaign/src/layout/header/PageLink.tsx | 5 +- .../[domain]/[language]/index.page.tsx | 0 demo/site/next.config.js | 3 + demo/site/package.json | 18 +- demo/site/src/common/blocks/DamImageBlock.tsx | 4 +- demo/site/src/common/blocks/HeadlineBlock.tsx | 6 +- demo/site/src/common/blocks/LinkBlock.tsx | 12 +- demo/site/src/common/blocks/RichTextBlock.tsx | 2 +- demo/site/src/documents/pages/Page.tsx | 6 +- .../pages/blocks/PageContentBlock.tsx | 3 +- .../src/documents/pages/blocks/SeoBlock.tsx | 38 +- demo/site/src/layout/header/PageLink.tsx | 5 +- 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 + .../page/content.page.tsx} | 0 .../[domain]/[language]/[[...path]].page.tsx | 29 - package.json | 29 + packages/admin/package.json | 29 +- .../src/brevoContacts/BrevoContactsGrid.tsx | 9 +- .../src/brevoContacts/BrevoContactsPage.tsx | 6 +- .../brevoContacts/form/BrevoContactForm.tsx | 12 +- .../contactImport/useContactImportFromCsv.tsx | 6 +- .../src/emailCampaigns/EmailCampaignsGrid.tsx | 9 +- .../src/emailCampaigns/EmailCampaignsPage.tsx | 5 +- .../emailCampaigns/form/EmailCampaignForm.tsx | 12 +- .../statistics/EmailCampaignStatistics.tsx | 4 +- .../emailCampaigns/view/EmailCampaignView.tsx | 12 +- .../src/targetGroups/TargetGroupForm.tsx | 12 +- .../src/targetGroups/TargetGroupsGrid.tsx | 9 +- .../src/targetGroups/TargetGroupsPage.tsx | 5 +- .../addContacts/AddContactsGridSelect.tsx | 13 +- .../AllAssignedContactsGrid.tsx | 16 +- packages/api/package.json | 36 +- packages/api/schema.gql | 37 +- .../brevo-contact-import.resolver.ts | 36 +- .../src/brevo-contact/brevo-contact.module.ts | 4 +- packages/api/src/brevo-module.ts | 18 +- .../dto/email-campaign.filter.ts | 20 +- .../target-group/dto/target-group.filter.ts | 14 +- pnpm-lock.yaml | 2874 +++++++++-------- 79 files changed, 2262 insertions(+), 2058 deletions(-) create mode 100644 .changeset/fast-weeks-remember.md 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 rename demo/campaign/src/pages/{preview => block-preview}/[domain]/[language]/index.page.tsx (100%) create mode 100644 demo/site/src/pages/api/site-preview.page.ts rename demo/site/src/pages/{preview/[domain]/[language]/admin/page.page.tsx => block-preview/page/content.page.tsx} (100%) delete mode 100644 demo/site/src/pages/preview/[domain]/[language]/[[...path]].page.tsx diff --git a/.changeset/fast-weeks-remember.md b/.changeset/fast-weeks-remember.md new file mode 100644 index 00000000..412b2d8f --- /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.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/.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/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/ diff --git a/demo/admin/package.json b/demo/admin/package.json index 23716011..7969f0fb 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -23,25 +23,23 @@ "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": "^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.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": "^6.8.0", + "@comet/cms-admin": "^7.5.0", "@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", - "@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", @@ -64,8 +62,8 @@ "react-router-dom": "^5.1.2" }, "devDependencies": { - "@comet/cli": "^6.8.0", - "@comet/eslint-config": "^6.8.0", + "@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/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/admin/src/App.tsx b/demo/admin/src/App.tsx index 94bca084..5d4d66b8 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"; @@ -59,30 +56,33 @@ 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.blockPreviewBaseUrl}/${scope.language}`, + blockPreviewBaseUrl: `${siteConfig.url}/block-preview`, + sitePreviewApiUrl: `${siteConfig.url}/api/site-preview`, + }; + }, + }} + > + + scope.domain}> + + + { - return `${config.campaignUrl}/preview/${scope.domain}/${scope.language}`; + return `${config.campaignUrl}/block-preview/${scope.domain}/${scope.language}`; }, }} > @@ -100,18 +100,17 @@ export function App() { - - - - - - - + + + + + + ); } 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) => } /> ); }} 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" }}> 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 (
diff --git a/demo/admin/src/common/brevoModuleConfig/brevoContactsPageAttributesConfig.tsx b/demo/admin/src/common/brevoModuleConfig/brevoContactsPageAttributesConfig.tsx index 95b2deb3..208219c0 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 { GQLBrevoContactBranch, GQLBrevoContactSalutation } from "@src/graphql.generated"; import { DocumentNode } from "graphql"; import gql from "graphql-tag"; diff --git a/demo/admin/src/documents/links/EditLink.tsx b/demo/admin/src/documents/links/EditLink.tsx index ef1f4fd4..cd4f7684 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 { ContentScopeIndicator, createUsePage, PageName } from "@comet/cms-admin"; import { IconButton } from "@mui/material"; import { LinkBlock } from "@src/common/blocks/LinkBlock"; import * as React from "react"; @@ -71,10 +71,10 @@ export const EditLink: React.FC = ({ id }) => { return ; } - if (!linkState) return <>; + if (!linkState) return null; return ( - + <> {hasChanges && ( { @@ -93,7 +93,7 @@ export const EditLink: React.FC = ({ id }) => { }} /> )} - + }> @@ -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 690ec832..1a82cb7f 100644 --- a/demo/admin/src/documents/pages/EditPage.tsx +++ b/demo/admin/src/documents/pages/EditPage.tsx @@ -4,8 +4,8 @@ import { ArrowLeft, Preview } from "@comet/admin-icons"; import { AdminComponentRoot, AdminTabLabel } from "@comet/blocks-admin"; import { BlockPreviewWithTabs, + ContentScopeIndicator, createUsePage, - EditPageLayout, openSitePreviewWindow, PageName, useBlockPreview, @@ -90,14 +90,14 @@ export const EditPage: React.FC = ({ id, category }) => { }); } - if (!pageState) return <>; + if (!pageState) return null; if (loading) { return ; } return ( - + <> {hasChanges && ( { @@ -117,7 +117,7 @@ export const EditPage: React.FC = ({ id, category }) => { }} /> )} - + }> @@ -142,7 +142,11 @@ export const EditPage: React.FC = ({ id, category }) => { - + {[ { key: "content", @@ -172,6 +176,6 @@ export const EditPage: React.FC = ({ id, category }) => { {dialogs} - + ); }; 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"; 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/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; diff --git a/demo/api/.prettierignore b/demo/api/.prettierignore index d197f481..348889e4 100644 --- a/demo/api/.prettierignore +++ b/demo/api/.prettierignore @@ -1,3 +1,3 @@ dist/ block-meta.json -uploads/ \ No newline at end of file +uploads/ diff --git a/demo/api/block-meta.json b/demo/api/block-meta.json index 40aa326b..bcb79027 100644 --- a/demo/api/block-meta.json +++ b/demo/api/block-meta.json @@ -16,6 +16,65 @@ } ] }, + { + "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 + }, + { + "name": "size", + "kind": "Number", + "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 +147,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 +224,12 @@ ], "inputFields": [ { - "name": "damFileId", - "kind": "String", + "name": "autoplay", + "kind": "Boolean", "nullable": true }, { - "name": "autoplay", + "name": "showControls", "kind": "Boolean", "nullable": true }, @@ -174,8 +239,14 @@ "nullable": true }, { - "name": "showControls", - "kind": "Boolean", + "name": "previewImage", + "kind": "Block", + "block": "PixelImage", + "nullable": false + }, + { + "name": "damFileId", + "kind": "String", "nullable": true } ] @@ -328,6 +399,23 @@ "fields": [], "inputFields": [] }, + { + "name": "EmailLink", + "fields": [ + { + "name": "email", + "kind": "String", + "nullable": true + } + ], + "inputFields": [ + { + "name": "email", + "kind": "String", + "nullable": true + } + ] + }, { "name": "ExternalLink", "fields": [ @@ -422,6 +510,11 @@ "kind": "String", "nullable": false }, + { + "name": "scope", + "kind": "Json", + "nullable": true + }, { "name": "documentType", "kind": "String", @@ -679,6 +772,23 @@ } ] }, + { + "name": "PhoneLink", + "fields": [ + { + "name": "phone", + "kind": "String", + "nullable": true + } + ], + "inputFields": [ + { + "name": "phone", + "kind": "String", + "nullable": true + } + ] + }, { "name": "PixelImage", "fields": [ @@ -1370,22 +1480,36 @@ ] }, { - "name": "YouTubeVideo", + "name": "VimeoVideo", "fields": [ { - "name": "youtubeIdentifier", - "kind": "String", - "nullable": false + "name": "autoplay", + "kind": "Boolean", + "nullable": true }, { - "name": "aspectRatio", - "kind": "Enum", - "enum": [ - "16X9", - "4X3" - ], + "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", @@ -1400,23 +1524,51 @@ "name": "loop", "kind": "Boolean", "nullable": true - } - ], - "inputFields": [ + }, { - "name": "youtubeIdentifier", - "kind": "String", + "name": "previewImage", + "kind": "Block", + "block": "PixelImage", "nullable": false }, { - "name": "aspectRatio", - "kind": "Enum", - "enum": [ - "16X9", - "4X3" - ], + "name": "vimeoIdentifier", + "kind": "String", + "nullable": true + } + ] + }, + { + "name": "YouTubeVideo", + "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": "youtubeIdentifier", + "kind": "String", + "nullable": true + } + ], + "inputFields": [ { "name": "autoplay", "kind": "Boolean", @@ -1431,6 +1583,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/package.json b/demo/api/package.json index 218f7de1..a1a6ca55 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -49,19 +49,17 @@ } }, "dependencies": { - "@aws-sdk/client-s3": "^3.49.0", - "@azure/storage-blob": "^12.0.0", - "@comet/blocks-api": "^6.8.0", + "@comet/blocks-api": "^7.5.0", "@comet/brevo-api": "workspace:*", - "@comet/cms-api": "^6.8.0", + "@comet/cms-api": "^7.5.0", "@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", @@ -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", @@ -102,7 +99,7 @@ "webpack": "^5.64.2" }, "devDependencies": { - "@comet/eslint-config": "^6.8.0", + "@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 faab9573..a4f94f8b 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 { @@ -151,11 +151,22 @@ 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! email: String! - language: String! } type PaginatedUserList { @@ -516,7 +527,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! @@ -534,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! @@ -548,7 +560,6 @@ input UserFilter { name: StringFilter email: StringFilter status: StringFilter - language: StringFilter and: [UserFilter!] or: [UserFilter!] } @@ -570,7 +581,6 @@ enum UserSortField { name email status - language } enum SortDirection { @@ -602,8 +612,8 @@ input RedirectFilter { generationType: StringFilter source: StringFilter active: BooleanFilter - createdAt: DateFilter - updatedAt: DateFilter + createdAt: DateTimeFilter + updatedAt: DateTimeFilter and: [RedirectFilter!] or: [RedirectFilter!] } @@ -612,7 +622,7 @@ input BooleanFilter { equal: Boolean } -input DateFilter { +input DateTimeFilter { equal: DateTime lowerThan: DateTime greaterThan: DateTime @@ -669,11 +679,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!] } @@ -692,8 +702,8 @@ enum EmailCampaignSortField { } input TargetGroupFilter { - createdAt: DateFilter - updatedAt: DateFilter + createdAt: DateTimeFilter + updatedAt: DateTimeFilter title: StringFilter and: [TargetGroupFilter!] or: [TargetGroupFilter!] diff --git a/demo/api/src/app.module.ts b/demo/api/src/app.module.ts index 6df95ecf..33703038 100644 --- a/demo/api/src/app.module.ts +++ b/demo/api/src/app.module.ts @@ -1,23 +1,20 @@ import { BrevoModule } from "@comet/brevo-api"; import { BlobStorageModule, - BLOCKS_MODULE_TRANSFORMER_DEPENDENCIES, BlocksModule, BlocksTransformerMiddlewareFactory, BuildsModule, DamModule, DependenciesModule, - FilesService, - ImagesService, + FileUploadsModule, KubernetesModule, PageTreeModule, - PageTreeService, - PublicUploadModule, 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"; import { DbModule } from "@src/db/db.module"; import { Link } from "@src/documents/links/entities/link.entity"; @@ -26,6 +23,8 @@ 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"; import { AccessControlService } from "./auth/access-control.service"; @@ -53,13 +52,22 @@ export class AppModule { imports: [ ConfigModule.forRoot(config), DbModule, - GraphQLModule.forRootAsync({ + GraphQLModule.forRootAsync({ driver: ApolloDriver, imports: [BlocksModule], - useFactory: (dependencies: Record) => ({ + 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, @@ -71,14 +79,15 @@ 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({ useFactory: (accessControlService: AccessControlService) => ({ + systemUsers: ["system-user"], availableContentScopes: [ { domain: "main", language: "en" }, { domain: "main", language: "de" }, @@ -90,19 +99,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, }), @@ -122,12 +119,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, @@ -137,10 +132,10 @@ export class AppModule { StatusModule, MenusModule, DependenciesModule, - PublicUploadModule.register({ + FileUploadsModule.register({ acceptedMimeTypes: ["text/csv"], - maxFileSize: config.publicUploads.maxFileSize, - directory: `${config.blob.storageDirectoryPrefix}-public-uploads`, + maxFileSize: config.fileUploads.maxFileSize, + directory: `${config.blob.storageDirectoryPrefix}-file-uploads`, }), BrevoModule.register({ brevo: { @@ -185,6 +180,7 @@ export class AppModule { }), BrevoContactSubscribeModule, BrevoTransactionalMailsModule, + FileUploadDummyModule, ], }; } 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({ 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, ], 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/comet-config.json b/demo/api/src/comet-config.json index 43ff193e..858a64e0 100644 --- a/demo/api/src/comet-config.json +++ b/demo/api/src/comet-config.json @@ -4,12 +4,11 @@ "quality": 80 }, "dam": { - "additionalMimeTypes": [], "uploadsMaxFileSize": 500, "allowedImageSizes": [1200], "allowedImageAspectRatios": ["16x9", "4x3", "3x2", "3x1", "2x1", "1x1", "1x2", "1x3", "2x3", "3x4", "9x16"] }, - "publicUploads": { + "fileUploads": { "maxFileSize": 15 } } 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"; 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) {} 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; + } +} 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..48f8eb13 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -19,7 +19,8 @@ "copy-schema-files": "node copy-schema-files.js" }, "dependencies": { - "@comet/cms-site": "^6.8.0", + "@comet/cms-site": "^7.5.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", @@ -34,22 +35,21 @@ "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", + "next": "^14.2.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.5.0", + "@comet/eslint-config": "^7.5.0", "@formatjs/cli": "^4.2.33", "@gitbeaker/node": "^35.6.0", "@graphql-codegen/add": "^3.0.0", @@ -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/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/HeadlineBlock.tsx b/demo/campaign/src/common/blocks/HeadlineBlock.tsx index 95b6cb59..d3048a98 100644 --- a/demo/campaign/src/common/blocks/HeadlineBlock.tsx +++ b/demo/campaign/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/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/demo/campaign/src/common/blocks/RichTextBlock.tsx b/demo/campaign/src/common/blocks/RichTextBlock.tsx index 1462536f..bec68d8c 100644 --- a/demo/campaign/src/common/blocks/RichTextBlock.tsx +++ b/demo/campaign/src/common/blocks/RichTextBlock.tsx @@ -108,7 +108,7 @@ export const RichTextBlock = withPreview( const rendered = redraft(draftContent, renderers); return ( - + {rendered} ); diff --git a/demo/campaign/src/components/Root.tsx b/demo/campaign/src/components/Root.tsx index 64826a96..8a3a166c 100644 --- a/demo/campaign/src/components/Root.tsx +++ b/demo/campaign/src/components/Root.tsx @@ -1,8 +1,8 @@ +import { MjmlConditionalComment } from "@faire/mjml-react/extensions"; import { Mjml, MjmlAttributes, MjmlBody, MjmlDivider, MjmlHead, MjmlSection, MjmlText, MjmlTitle } from "@luma-team/mjml-react"; import { commonImageBlockStyles } from "@src/common/blocks/CommonImageBlock"; import { css } from "@src/util/stylesHelper"; import { theme } from "@src/util/theme"; -import { MjmlConditionalComment } from "mjml-react/extensions"; import React from "react"; import { renderToString } from "react-dom/server"; diff --git a/demo/campaign/src/documents/pages/Page.tsx b/demo/campaign/src/documents/pages/Page.tsx index bbe1436e..49890fa3 100644 --- a/demo/campaign/src/documents/pages/Page.tsx +++ b/demo/campaign/src/documents/pages/Page.tsx @@ -37,11 +37,7 @@ export function Page(props: PropsWithLayout): JSX.Element { canonicalUrl={`${process.env.NEXT_PUBLIC_CAMPAIGN_URL}${props.pageContent?.path}`} /> )} - {document && document.__typename === "Page" ? ( - <> -
{document.content && }
- - ) : null} + {document && document.__typename === "Page" ?
{document.content && }
: null} ); } diff --git a/demo/campaign/src/documents/pages/blocks/SeoBlock.tsx b/demo/campaign/src/documents/pages/blocks/SeoBlock.tsx index b7d2cffc..0b395246 100644 --- a/demo/campaign/src/documents/pages/blocks/SeoBlock.tsx +++ b/demo/campaign/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/campaign/src/layout/header/PageLink.tsx b/demo/campaign/src/layout/header/PageLink.tsx index a39792bf..da2be939 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"; @@ -20,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/demo/campaign/src/pages/preview/[domain]/[language]/index.page.tsx b/demo/campaign/src/pages/block-preview/[domain]/[language]/index.page.tsx similarity index 100% rename from demo/campaign/src/pages/preview/[domain]/[language]/index.page.tsx rename to demo/campaign/src/pages/block-preview/[domain]/[language]/index.page.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..2f03a350 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.5.0", "@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.2.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.5.0", + "@comet/eslint-config": "^7.5.0", "@formatjs/cli": "^4.2.33", "@gitbeaker/node": "^35.6.0", "@graphql-codegen/add": "^3.0.0", @@ -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/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/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/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/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/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/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..da2be939 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"; @@ -20,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/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]/admin/page.page.tsx b/demo/site/src/pages/block-preview/page/content.page.tsx similarity index 100% rename from demo/site/src/pages/preview/[domain]/[language]/admin/page.page.tsx rename to demo/site/src/pages/block-preview/page/content.page.tsx 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/package.json b/package.json index 9a9d0763..7bab62e8 100644 --- a/package.json +++ b/package.json @@ -38,5 +38,34 @@ "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" + } + }, + "@faire/mjml-react@3": { + "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/packages/admin/package.json b/packages/admin/package.json index bd258bf3..09d69af0 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -34,22 +34,21 @@ "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": "^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.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", "@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", @@ -57,7 +56,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", @@ -77,16 +75,15 @@ }, "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.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", "@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/packages/admin/src/brevoContacts/BrevoContactsGrid.tsx b/packages/admin/src/brevoContacts/BrevoContactsGrid.tsx index 3c2a62b8..a1f28de0 100644 --- a/packages/admin/src/brevoContacts/BrevoContactsGrid.tsx +++ b/packages/admin/src/brevoContacts/BrevoContactsGrid.tsx @@ -1,11 +1,12 @@ import { DocumentNode, gql, useApolloClient, useQuery } from "@apollo/client"; import { + DataGridToolbar, + GridColDef, MainContent, messages, RowActionsItem, RowActionsMenu, StackLink, - Toolbar, ToolbarActions, ToolbarFillSpace, ToolbarItem, @@ -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"; @@ -68,7 +69,7 @@ function BrevoContactsGridToolbar({ intl, scope }: { intl: IntlShape; scope: GQL return ( <> - + @@ -84,7 +85,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..8ad01cb0 100644 --- a/packages/admin/src/brevoContacts/BrevoContactsPage.tsx +++ b/packages/admin/src/brevoContacts/BrevoContactsPage.tsx @@ -1,6 +1,5 @@ -import { Stack, StackPage, StackSwitch } from "@comet/admin"; -import { useContentScope } from "@comet/cms-admin"; -import { GridColDef } from "@mui/x-data-grid"; +import { GridColDef, Stack, StackPage, StackSwitch, StackToolbar } from "@comet/admin"; +import { ContentScopeIndicator, useContentScope } from "@comet/cms-admin"; import { DocumentNode } from "graphql"; import * as React from "react"; import { useIntl } from "react-intl"; @@ -36,6 +35,7 @@ function createBrevoContactsPage({ + } /> apiRef={formApiRef} onSubmit={handleSubmit} mode={mode} initialValues={initialValues}> {({ values }) => ( - + <> {saveConflict.dialogs} - + }> @@ -174,7 +174,7 @@ export function BrevoContactForm({ id, scope, input2State, additionalFormFields, - + @@ -221,7 +221,7 @@ export function BrevoContactForm({ id, scope, input2State, additionalFormFields, )} - + )} ); diff --git a/packages/admin/src/common/contactImport/useContactImportFromCsv.tsx b/packages/admin/src/common/contactImport/useContactImportFromCsv.tsx index d405f049..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, }); @@ -78,12 +78,12 @@ const ContactImportComponent = ({ scope, targetGroupId, fileInputRef, refetchQue ); } - const publicUploadId = (await response.json()).id; + const fileUploadId = (await response.json()).id; const { data } = await client.mutate({ mutation: startBrevoContactImportMutation, variables: { - fileId: publicUploadId, + fileId: fileUploadId, scope, }, }); diff --git a/packages/admin/src/emailCampaigns/EmailCampaignsGrid.tsx b/packages/admin/src/emailCampaigns/EmailCampaignsGrid.tsx index 2fa765da..0fb53c8e 100644 --- a/packages/admin/src/emailCampaigns/EmailCampaignsGrid.tsx +++ b/packages/admin/src/emailCampaigns/EmailCampaignsGrid.tsx @@ -1,12 +1,13 @@ import { gql, useApolloClient, useQuery } from "@apollo/client"; import { CrudContextMenu, + DataGridToolbar, + GridColDef, GridFilterButton, MainContent, muiGridFilterToGql, muiGridSortToGql, StackLink, - Toolbar, ToolbarActions, ToolbarAutomaticTitleItem, ToolbarFillSpace, @@ -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"; @@ -88,7 +89,7 @@ const createEmailCampaignMutation = gql` function EmailCampaignsGridToolbar() { return ( - + @@ -102,7 +103,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 72a219ae..390de493 100644 --- a/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx +++ b/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx @@ -24,8 +24,8 @@ import { } from "@comet/blocks-admin"; import { BlockPreviewWithTabs, + ContentScopeIndicator, ContentScopeInterface, - EditPageLayout, queryUpdatedAt, resolveHasSaveConflict, useBlockPreview, @@ -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; @@ -222,9 +222,9 @@ export function EmailCampaignForm({ id, EmailCampaignContentBlock, scope }: Form const isSchedulingDisabled = state.sendingState === "SENT" || mode === "add" || state.targetGroups.length === 0 || isScheduledDateInPast; return ( - + <> {saveConflict.dialogs} - + }> @@ -306,6 +306,6 @@ export function EmailCampaignForm({ id, EmailCampaignContentBlock, scope }: Form ]} - + ); } 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 a9e006a9..639e1510 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, ContentScopeIndicator, useBlockPreview, useCmsBlockContext, useContentScope } from "@comet/cms-admin"; import { IconButton } from "@mui/material"; import React from "react"; import { FormattedMessage } from "react-intl"; @@ -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 = { @@ -52,8 +52,8 @@ 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..c6ccc844 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, @@ -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 { ContentScopeIndicator, ContentScopeInterface, queryUpdatedAt, resolveHasSaveConflict, useFormSaveConflict } from "@comet/cms-admin"; import { IconButton } from "@mui/material"; import { FormApi } from "final-form"; import React from "react"; @@ -118,9 +118,9 @@ export function TargetGroupForm({ id, scope, additionalFormFields, input2State, return ( apiRef={formApiRef} onSubmit={handleSubmit} mode={mode} initialValues={initialValues}> {({ values }) => ( - + <> {saveConflict.dialogs} - + }> @@ -131,7 +131,7 @@ export function TargetGroupForm({ id, scope, additionalFormFields, input2State, - + @@ -182,7 +182,7 @@ export function TargetGroupForm({ id, scope, additionalFormFields, input2State, - + )} ); diff --git a/packages/admin/src/targetGroups/TargetGroupsGrid.tsx b/packages/admin/src/targetGroups/TargetGroupsGrid.tsx index dfc85158..da36aef7 100644 --- a/packages/admin/src/targetGroups/TargetGroupsGrid.tsx +++ b/packages/admin/src/targetGroups/TargetGroupsGrid.tsx @@ -1,12 +1,13 @@ import { gql, useApolloClient, useQuery } from "@apollo/client"; import { CrudContextMenu, + DataGridToolbar, + GridColDef, GridFilterButton, MainContent, muiGridFilterToGql, muiGridSortToGql, StackLink, - Toolbar, ToolbarActions, ToolbarAutomaticTitleItem, ToolbarFillSpace, @@ -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"; @@ -112,7 +113,7 @@ export function TargetGroupsGrid({ function TargetGroupsGridToolbar() { return ( - + @@ -133,7 +134,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 +83,7 @@ const AssignedContactsGridToolbar = ({ - + {component} ); @@ -92,7 +93,7 @@ const AssignableContactsGridToolbar = () => { const intl = useIntl(); return ( - + @@ -104,7 +105,7 @@ const AssignableContactsGridToolbar = () => { })} /> - + ); }; diff --git a/packages/admin/src/targetGroups/allAssignedContacts/AllAssignedContactsGrid.tsx b/packages/admin/src/targetGroups/allAssignedContacts/AllAssignedContactsGrid.tsx index 6c454bee..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 { Toolbar, 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"; @@ -16,7 +24,7 @@ const AssignedContactsGridToolbar = () => { const intl = useIntl(); return ( - + @@ -28,7 +36,7 @@ const AssignedContactsGridToolbar = () => { })} /> - + ); }; diff --git a/packages/api/package.json b/packages/api/package.json index 0e7d8275..cca1acfa 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" @@ -35,17 +36,15 @@ "node-fetch": "^2.6.1" }, "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.5.0", + "@comet/cms-api": "^7.5.0", + "@comet/eslint-config": "^7.5.0", "@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", @@ -66,7 +65,6 @@ "jest-junit": "^15.0.0", "lodash.isequal": "^4.5.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", @@ -77,13 +75,13 @@ "uuid": "^8.3.2" }, "peerDependencies": { - "@comet/blocks-api": "^6.0.0", - "@comet/cms-api": "^6.0.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", + "@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", + "@mikro-orm/nestjs": "^5.2.3", + "@mikro-orm/postgresql": "^5.9.8", "@nestjs/common": "^9.0.0", "@nestjs/platform-express": "^9.0.0", "reflect-metadata": "^0.1.13", @@ -93,4 +91,4 @@ "access": "public", "registry": "https://registry.npmjs.org" } -} \ No newline at end of file +} diff --git a/packages/api/schema.gql b/packages/api/schema.gql index ee8acb36..056e9f26 100644 --- a/packages/api/schema.gql +++ b/packages/api/schema.gql @@ -8,18 +8,6 @@ The `JSONObject` scalar type represents JSON objects as specified by [ECMA-404]( """ scalar JSONObject @specifiedBy(url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf") -type Dependency { - rootId: String! - rootGraphqlObjectType: String! - rootColumnName: String! - jsonPath: String! - visible: Boolean! - targetGraphqlObjectType: String! - targetId: String! - name: String - secondaryInformation: String -} - type ImageCropArea { focalPoint: FocalPoint! width: Float @@ -37,11 +25,22 @@ enum FocalPoint { SOUTHEAST } +type Dependency { + rootId: String! + rootGraphqlObjectType: String! + rootColumnName: String! + jsonPath: String! + visible: Boolean! + targetGraphqlObjectType: String! + targetId: String! + name: String + secondaryInformation: String +} + type User { id: String! name: String! email: String! - language: String! } type CsvImportInformation { @@ -184,14 +183,14 @@ type Query { } input TargetGroupFilter { - createdAt: DateFilter - updatedAt: DateFilter + createdAt: DateTimeFilter + updatedAt: DateTimeFilter title: StringFilter and: [TargetGroupFilter!] or: [TargetGroupFilter!] } -input DateFilter { +input DateTimeFilter { equal: DateTime lowerThan: DateTime greaterThan: DateTime @@ -225,11 +224,11 @@ enum SortDirection { } input EmailCampaignFilter { - createdAt: DateFilter - updatedAt: DateFilter + createdAt: DateTimeFilter + updatedAt: DateTimeFilter title: StringFilter subject: StringFilter - scheduledAt: DateFilter + scheduledAt: DateTimeFilter and: [EmailCampaignFilter!] or: [EmailCampaignFilter!] } 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 f3212b8a..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,7 +1,7 @@ -import { BlobStorageBackendService, PublicUpload, RequiredPermission } from "@comet/cms-api"; -import { createHashedPath } from "@comet/cms-api/lib/dam/files/files.utils"; -import { PublicUploadConfig } from "@comet/cms-api/lib/public-upload/public-upload.config"; -import { PUBLIC_UPLOAD_CONFIG } from "@comet/cms-api/lib/public-upload/public-upload.constants"; +import { BlobStorageBackendService, FileUpload, RequiredPermission } from "@comet/cms-api"; +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"; import { InjectRepository } from "@mikro-orm/nestjs"; import { Inject, Type } from "@nestjs/common"; @@ -29,17 +29,17 @@ export function createBrevoContactImportResolver({ @Resolver(() => BrevoContact) @RequiredPermission(["brevo-newsletter"], { skipScopeCheck: true }) class BrevoContactImportResolver { - private publicUploadsConfig: PublicUploadConfig; + private fileUploadsConfig: FileUploadsConfig; constructor( @Inject(BREVO_MODULE_CONFIG) private readonly config: BrevoModuleConfig, @Inject(BrevoContactImportService) private readonly brevoContactImportService: BrevoContactImportService, - @InjectRepository(PublicUpload) private readonly publicUploadRepository: EntityRepository, + @InjectRepository(FileUpload) private readonly fileUploadRepository: EntityRepository, private readonly storageService: BlobStorageBackendService, private readonly moduleRef: ModuleRef, private readonly entityManager: EntityManager, ) { - this.publicUploadsConfig = this.moduleRef.get(PUBLIC_UPLOAD_CONFIG, { strict: false }); + this.fileUploadsConfig = this.moduleRef.get(FILE_UPLOADS_CONFIG, { strict: false }); } @Mutation(() => CsvImportInformation) @@ -48,13 +48,13 @@ export function createBrevoContactImportResolver({ let objectName = null; try { - const publicUpload = await this.publicUploadRepository.findOne(fileId); + const fileUpload = await this.fileUploadRepository.findOne(fileId); - if (publicUpload) { - objectName = createHashedPath(publicUpload.contentHash); + if (fileUpload) { + objectName = createHashedPath(fileUpload.contentHash); - if (await this.storageService.fileExists(this.publicUploadsConfig.directory, objectName)) { - storageFile = await this.storageService.getFile(this.publicUploadsConfig.directory, objectName); + if (await this.storageService.fileExists(this.fileUploadsConfig.directory, objectName)) { + storageFile = await this.storageService.getFile(this.fileUploadsConfig.directory, objectName); } } @@ -71,9 +71,9 @@ export function createBrevoContactImportResolver({ targetGroupIds, }); - if (await this.storageService.fileExists(this.publicUploadsConfig.directory, objectName)) { - await this.storageService.removeFile(this.publicUploadsConfig.directory, objectName); - await this.publicUploadRepository.nativeDelete({ id: fileId }); + if (await this.storageService.fileExists(this.fileUploadsConfig.directory, objectName)) { + await this.storageService.removeFile(this.fileUploadsConfig.directory, objectName); + await this.fileUploadRepository.nativeDelete({ id: fileId }); } await this.entityManager.flush(); @@ -81,9 +81,9 @@ export function createBrevoContactImportResolver({ return result; } catch (error) { // in case of error always delete the uploaded file - if (objectName && (await this.storageService.fileExists(this.publicUploadsConfig.directory, objectName))) { - await this.storageService.removeFile(this.publicUploadsConfig.directory, objectName); - await this.publicUploadRepository.nativeDelete({ id: fileId }); + if (objectName && (await this.storageService.fileExists(this.fileUploadsConfig.directory, objectName))) { + await this.storageService.removeFile(this.fileUploadsConfig.directory, objectName); + await this.fileUploadRepository.nativeDelete({ id: fileId }); } await this.entityManager.flush(); diff --git a/packages/api/src/brevo-contact/brevo-contact.module.ts b/packages/api/src/brevo-contact/brevo-contact.module.ts index 4dde49cf..bd3f6e7a 100644 --- a/packages/api/src/brevo-contact/brevo-contact.module.ts +++ b/packages/api/src/brevo-contact/brevo-contact.module.ts @@ -1,4 +1,4 @@ -import { PublicUpload } from "@comet/cms-api"; +import { FileUpload } from "@comet/cms-api"; import { MikroOrmModule } from "@mikro-orm/nestjs"; import { DynamicModule, Module, Type } from "@nestjs/common"; @@ -43,7 +43,7 @@ export class BrevoContactModule { return { module: BrevoContactModule, - imports: [BrevoApiModule, ConfigModule, MikroOrmModule.forFeature([TargetGroup, PublicUpload])], + imports: [BrevoApiModule, ConfigModule, MikroOrmModule.forFeature([TargetGroup, FileUpload])], providers: [ BrevoContactImportService, BrevoContactsService, diff --git a/packages/api/src/brevo-module.ts b/packages/api/src/brevo-module.ts index be99b038..171263c3 100644 --- a/packages/api/src/brevo-module.ts +++ b/packages/api/src/brevo-module.ts @@ -1,6 +1,6 @@ -import { PublicUploadsService } from "@comet/cms-api"; -import { PublicUploadConfig } from "@comet/cms-api/lib/public-upload/public-upload.config"; -import { PUBLIC_UPLOAD_CONFIG } from "@comet/cms-api/lib/public-upload/public-upload.constants"; +import { FileUploadsService } from "@comet/cms-api"; +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 { DynamicModule, Global, Module, Optional } from "@nestjs/common"; import { ModuleRef } from "@nestjs/core"; @@ -15,16 +15,16 @@ import { TargetGroupModule } from "./target-group/target-group.module"; @Global() @Module({}) export class BrevoModule { - constructor(private readonly moduleRef: ModuleRef, @Optional() private readonly myGlobalService: PublicUploadsService) { - let publicUploadsConfig: PublicUploadConfig | undefined; + constructor(private readonly moduleRef: ModuleRef, @Optional() private readonly myGlobalService: FileUploadsService) { + let fileUploadsConfig: FileUploadsConfig | undefined; try { - publicUploadsConfig = this.moduleRef.get(PUBLIC_UPLOAD_CONFIG, { strict: false }); + fileUploadsConfig = this.moduleRef.get(FILE_UPLOADS_CONFIG, { strict: false }); } catch (error) { - throw new Error("PublicUploadModule is an required import for BrevoModule"); + throw new Error("FileUploadsModule is an required import for BrevoModule"); } - if (publicUploadsConfig && !publicUploadsConfig.acceptedMimeTypes.includes("text/csv")) { - throw new Error("BrevoModule requires mime type 'text/csv' in PublicUploadModule's config"); + if (fileUploadsConfig && !fileUploadsConfig.acceptedMimeTypes.includes("text/csv")) { + throw new Error("BrevoModule requires mime type 'text/csv' in FileUploadsModule's config"); } } static register(config: BrevoModuleConfig): DynamicModule { 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() diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d7faa34c..68f6d5ca 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,8 @@ settings: autoInstallPeers: false excludeLinksFromLockfile: false +packageExtensionsChecksum: 8b8792973f669aa2277355fb90c68ff0 + importers: .: @@ -48,41 +50,41 @@ 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: ^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.5.0 + 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: ^6.8.0 - version: 6.8.0(@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: ^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.5.0 + 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: ^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.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: ^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.5.0 + 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: ^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.5.0 + 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) '@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.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) @@ -92,18 +94,12 @@ 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) '@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 @@ -157,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) @@ -166,11 +162,11 @@ importers: version: 5.3.4(react@17.0.2) devDependencies: '@comet/cli': - specifier: ^6.8.0 - version: 6.8.0 + specifier: ^7.5.0 + version: 7.5.0(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.5.0 + 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 @@ -279,21 +275,15 @@ 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: ^6.8.0 - version: 6.8.0(@nestjs/common@9.4.3)(class-transformer@0.5.1)(class-validator@0.13.2) + 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: ^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.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 @@ -304,20 +294,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) @@ -411,9 +401,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 @@ -434,8 +421,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.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 @@ -503,11 +490,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.5.0 + 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) '@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 @@ -525,7 +515,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 @@ -547,21 +537,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.2.0 + 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: ^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(@types/react@18.3.12)(react@18.3.1)(typescript@4.9.5) react-is: specifier: ^17.0.2 version: 17.0.2 @@ -572,8 +559,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(@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) @@ -585,11 +572,11 @@ importers: specifier: ^7.16.0 version: 7.23.7 '@comet/cli': - specifier: ^6.8.0 - version: 6.9.0 + specifier: ^7.5.0 + version: 7.5.0(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.5.0 + 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 @@ -624,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 @@ -660,8 +647,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.5.0 + 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 @@ -679,7 +666,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 @@ -696,17 +683,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.2.0 + 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: ^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(@types/react@18.3.12)(react@18.3.1)(typescript@4.9.5) react-is: specifier: ^17.0.2 version: 17.0.2 @@ -717,8 +704,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(@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) @@ -727,11 +714,11 @@ importers: specifier: ^7.16.0 version: 7.23.7 '@comet/cli': - specifier: ^6.8.0 - version: 6.8.0 + specifier: ^7.5.0 + version: 7.5.0(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.5.0 + 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 @@ -766,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 @@ -815,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) @@ -824,26 +811,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.5.0 + 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: ^6.8.0 - version: 6.8.0(@babel/cli@7.23.4) + specifier: ^7.5.0 + version: 7.5.0(@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.5.0 + 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: ^6.8.0 - version: 6.8.0(@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: ^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.5.0 + 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: ^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.5.0 + 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: ^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.5.0 + 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) @@ -859,9 +846,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) @@ -883,9 +867,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) @@ -921,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) @@ -962,39 +943,33 @@ 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: ^6.8.0 - version: 6.8.0(@nestjs/common@9.4.3)(class-transformer@0.5.1)(class-validator@0.13.2) + specifier: ^7.5.0 + version: 7.5.0(@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.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: ^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.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 '@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) @@ -1055,9 +1030,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 @@ -1141,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: @@ -1160,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 @@ -1169,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==} @@ -1352,509 +1328,558 @@ 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/crc32c@3.0.0: - resolution: {integrity: sha512-ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w==} + /@aws-crypto/crc32@5.2.0: + resolution: {integrity: sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==} + engines: {node: '>=16.0.0'} dependencies: - '@aws-crypto/util': 3.0.0 - '@aws-sdk/types': 3.489.0 - tslib: 1.14.1 + '@aws-crypto/util': 5.2.0 + '@aws-sdk/types': 3.679.0 + tslib: 2.6.2 - /@aws-crypto/ie11-detection@3.0.0: - resolution: {integrity: sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==} + /@aws-crypto/crc32c@5.2.0: + resolution: {integrity: sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==} dependencies: - tslib: 1.14.1 + '@aws-crypto/util': 5.2.0 + '@aws-sdk/types': 3.679.0 + tslib: 2.6.2 - /@aws-crypto/sha1-browser@3.0.0: - resolution: {integrity: sha512-NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw==} + /@aws-crypto/sha1-browser@5.2.0: + resolution: {integrity: sha512-OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==} 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-crypto/supports-web-crypto': 5.2.0 + '@aws-crypto/util': 5.2.0 + '@aws-sdk/types': 3.679.0 '@aws-sdk/util-locate-window': 3.465.0 - '@aws-sdk/util-utf8-browser': 3.259.0 - tslib: 1.14.1 + '@smithy/util-utf8': 2.0.2 + tslib: 2.6.2 - /@aws-crypto/sha256-browser@3.0.0: - resolution: {integrity: sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==} + /@aws-crypto/sha256-browser@5.2.0: + resolution: {integrity: sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==} 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-crypto/sha256-js': 5.2.0 + '@aws-crypto/supports-web-crypto': 5.2.0 + '@aws-crypto/util': 5.2.0 + '@aws-sdk/types': 3.679.0 '@aws-sdk/util-locate-window': 3.465.0 - '@aws-sdk/util-utf8-browser': 3.259.0 - tslib: 1.14.1 + '@smithy/util-utf8': 2.0.2 + tslib: 2.6.2 - /@aws-crypto/sha256-js@3.0.0: - resolution: {integrity: sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==} + /@aws-crypto/sha256-js@5.2.0: + resolution: {integrity: sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==} + engines: {node: '>=16.0.0'} dependencies: - '@aws-crypto/util': 3.0.0 - '@aws-sdk/types': 3.489.0 - tslib: 1.14.1 + '@aws-crypto/util': 5.2.0 + '@aws-sdk/types': 3.679.0 + tslib: 2.6.2 - /@aws-crypto/supports-web-crypto@3.0.0: - resolution: {integrity: sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==} + /@aws-crypto/supports-web-crypto@5.2.0: + resolution: {integrity: sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==} dependencies: - tslib: 1.14.1 + tslib: 2.6.2 - /@aws-crypto/util@3.0.0: - resolution: {integrity: sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==} + /@aws-crypto/util@5.2.0: + resolution: {integrity: sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==} dependencies: - '@aws-sdk/types': 3.489.0 - '@aws-sdk/util-utf8-browser': 3.259.0 - tslib: 1.14.1 + '@aws-sdk/types': 3.679.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'} + /@aws-sdk/client-s3@3.682.0: + resolution: {integrity: sha512-gn8yPhOmExhqRENnR/vKvsbTw9jaRPbfNE8fQ2j91ejXhpj632QDNdobY8TxxPm2UEW2ISAVM55r2/UPl0YP1Q==} + engines: {node: '>=16.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 + '@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.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.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.7 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'} + /@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.682.0 + dependencies: + '@aws-crypto/sha256-browser': 5.2.0 + '@aws-crypto/sha256-js': 5.2.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.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.682.0: + resolution: {integrity: sha512-PYH9RFUMYLFl66HSBq4tIx6fHViMLkhJHTYJoJONpBs+Td+NwVJ895AdLtDsBIhMS0YseCbPpuyjUCJgsUrwUw==} + engines: {node: '>=16.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 + '@aws-crypto/sha256-browser': 5.2.0 + '@aws-crypto/sha256-js': 5.2.0 + '@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.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.490.0: - resolution: {integrity: sha512-n2vQ5Qu2qi2I0XMI+IH99ElpIRHOJTa1+sqNC4juMYxKQBMvw+EnsqUtaL3QvTHoyxNB/R7mpkeBB6SzPQ1TtA==} - engines: {node: '>=14.0.0'} + /@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': 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 + '@aws-crypto/sha256-browser': 5.2.0 + '@aws-crypto/sha256-js': 5.2.0 + '@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.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.490.0: - resolution: {integrity: sha512-TSBWkXtxMU7q1Zo6w3v5wIOr/sj7P5Jw3OyO7lJrFGsPsDC2xwpxkVqTesDxkzgMRypO52xjYEmveagn1xxBHg==} - engines: {node: '>=14.0.0'} + /@aws-sdk/core@3.679.0: + resolution: {integrity: sha512-CS6PWGX8l4v/xyvX8RtXnBisdCa5+URzKd0L6GvHChype9qKUVxO/Gg6N/y43Hvg7MNWJt9FBPNWIxUB+byJwg==} + engines: {node: '>=16.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 + '@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.489.0: - resolution: {integrity: sha512-5PqYsx9G5SB2tqPT9/z/u0EkF6D4wP6HTMWQs+DfMdmwXihrqQAgeYaTtV3KbXqb88p6sfacwxhUvE6+Rm494w==} - engines: {node: '>=14.0.0'} + /@aws-sdk/credential-provider-env@3.679.0: + resolution: {integrity: sha512-EdlTYbzMm3G7VUNAMxr9S1nC1qUNqhKlAxFU8E7cKsAe8Bp29CD5HAs3POc56AVo9GC4yRIS+/mtlZSmrckzUA==} + engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/property-provider': 2.0.17 - '@smithy/types': 2.8.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-ini@3.490.0: - resolution: {integrity: sha512-7m63zyCpVqj9FsoDxWMWWRvL6c7zZzOcXYkHZmHujVVlmAXH0RT/vkXFkYgt+Ku+ov+v5NQrzwO5TmVoRt6O8g==} - engines: {node: '>=14.0.0'} + /@aws-sdk/credential-provider-http@3.679.0: + resolution: {integrity: sha512-ZoKLubW5DqqV1/2a3TSn+9sSKg0T8SsYMt1JeirnuLJF0mCoYFUaWMyvxxKuxPoqvUsaycxKru4GkpJ10ltNBw==} + engines: {node: '>=16.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 + '@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.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.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.490.0: - resolution: {integrity: sha512-Gh33u2O5Xbout8G3z/Z5H/CZzdG1ophxf/XS3iMFxA1cazQ7swY1UMmGvB7Lm7upvax5anXouItD1Ph3gzKc4w==} - engines: {node: '>=14.0.0'} + /@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.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 + '@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.489.0: - resolution: {integrity: sha512-3vKQYJZ5cZYjy0870CPmbmKRBgATw2xCygxhn4m4UDCjOXVXcGUtYD51DMWsvBo3S0W8kH+FIJV4yuEDMFqLFQ==} - engines: {node: '>=14.0.0'} + /@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.489.0 - '@smithy/property-provider': 2.0.17 - '@smithy/shared-ini-file-loader': 2.2.8 - '@smithy/types': 2.8.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.490.0: - resolution: {integrity: sha512-3UUBUoPbFvT58IhS4Vb23omYj/QPNkjgxu9p9ruQ3KSjLkanI4w8t/l/jljA65q83P7CoLnM5UKG9L7RA8/V1Q==} - engines: {node: '>=14.0.0'} + /@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.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 + '@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.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/middleware-bucket-endpoint@3.489.0: - resolution: {integrity: sha512-6rJ5bpNMKo7sEKQ6p2DMbQwM+ahMYASRxfdyH7hs18blvlcS20H1RYpNmJMqPPjxMwUWruty2JPMIRl4DFcv8w==} - engines: {node: '>=14.0.0'} + /@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.679.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 + '@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-expect-continue@3.489.0: - resolution: {integrity: sha512-2RZfnVZFaGHwzPDQJsyf9SXufu1gUd4VsMhm7dC7SWF85XmpDrozbFznS/tD22QdtyWjerLoydZJMq229hpPqg==} - engines: {node: '>=14.0.0'} + /@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.489.0 - '@smithy/protocol-http': 3.0.12 - '@smithy/types': 2.8.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-flexible-checksums@3.489.0: - resolution: {integrity: sha512-Cy3rBUMr4P7raxzrJFWNRshfKrKV2EojawaC9Bfk/T8aFlV+FmVrRg4ISAXMOfS5pfy3xfAbvkzjOaeqCsGfrA==} - engines: {node: '>=14.0.0'} + /@aws-sdk/middleware-expect-continue@3.679.0: + resolution: {integrity: sha512-nYsh9PdWrF4EahTRdXHGlNud82RPc508CNGdh1lAGfPU3tNveGfMBX3PcGBtPOse3p9ebNKRWVmUc9eXSjGvHA==} + engines: {node: '>=16.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 + '@aws-sdk/types': 3.679.0 + '@smithy/protocol-http': 4.1.5 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/middleware-host-header@3.489.0: - resolution: {integrity: sha512-Cl7HJ1jhOfllwf0CRx1eB4ypRGMqdGKWpc0eSTXty7wWSvCdMZUhwfjQqu2bIOIlgYxg/gFu6TVmVZ6g4O8PlA==} - engines: {node: '>=14.0.0'} + /@aws-sdk/middleware-flexible-checksums@3.682.0: + resolution: {integrity: sha512-5u1STth6iZUtAvPDO0NJVYKUX2EYKU7v84MYYaZ3O27HphRjFqDos0keL2KTnHn/KmMD68rM3yiUareWR8hnAQ==} + engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/protocol-http': 3.0.12 - '@smithy/types': 2.8.0 + '@aws-crypto/crc32': 5.2.0 + '@aws-crypto/crc32c': 5.2.0 + '@aws-sdk/core': 3.679.0 + '@aws-sdk/types': 3.679.0 + '@smithy/is-array-buffer': 3.0.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-location-constraint@3.489.0: - resolution: {integrity: sha512-NIVr+kHR2N6gxFeE3TNw2mEBxgj0N9xXBLy3dNYMMlAUvQlT/0z9HlC9+3XqcTS/Z5ElF/+pei6nqXTVt0He9A==} - engines: {node: '>=14.0.0'} + /@aws-sdk/middleware-host-header@3.679.0: + resolution: {integrity: sha512-y176HuQ8JRY3hGX8rQzHDSbCl9P5Ny9l16z4xmaiLo+Qfte7ee4Yr3yaAKd7GFoJ3/Mhud2XZ37fR015MfYl2w==} + engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/types': 2.8.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-logger@3.489.0: - resolution: {integrity: sha512-+EVDnWese61MdImcBNAgz/AhTcIZJaska/xsU3GWU9CP905x4a4qZdB7fExFMDu1Jlz5pJqNteFYYHCFMJhHfg==} - engines: {node: '>=14.0.0'} + /@aws-sdk/middleware-location-constraint@3.679.0: + resolution: {integrity: sha512-SA1C1D3XgoKTGxyNsOqd016ONpk46xJLWDgJUd00Zb21Ox5wYCoY6aDRKiaMRW+1VfCJdezs1Do3XLyIU9KxyA==} + engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/types': 2.8.0 + '@aws-sdk/types': 3.679.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/middleware-recursion-detection@3.489.0: - resolution: {integrity: sha512-m4rU+fTzziQcu9DKjRNZ4nQlXENEd2ZnJblJV4ONdWqqEjbmOgOj3P6aCCQlJdIbzuNvX1FBOZ5tY59ZpERo7Q==} - engines: {node: '>=14.0.0'} + /@aws-sdk/middleware-logger@3.679.0: + resolution: {integrity: sha512-0vet8InEj7nvIvGKk+ch7bEF5SyZ7Us9U7YTEgXPrBNStKeRUsgwRm0ijPWWd0a3oz2okaEwXsFl7G/vI0XiEA==} + engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/protocol-http': 3.0.12 - '@smithy/types': 2.8.0 + '@aws-sdk/types': 3.679.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/middleware-sdk-s3@3.489.0: - resolution: {integrity: sha512-/GGASx7mK9qEgy1znvleYMZKVqm3sOdGghqKdy2zgoGcH2jH+fZrLM0lDMT9bvdITmOCbJJs2rVHP3xm/ZWcXg==} - engines: {node: '>=14.0.0'} + /@aws-sdk/middleware-recursion-detection@3.679.0: + resolution: {integrity: sha512-sQoAZFsQiW/LL3DfKMYwBoGjYDEnMbA9WslWN8xneCmBAwKo6IcSksvYs23PP8XMIoBGe2I2J9BSr654XWygTQ==} + engines: {node: '>=16.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 + '@aws-sdk/types': 3.679.0 + '@smithy/protocol-http': 4.1.5 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/middleware-signing@3.489.0: - resolution: {integrity: sha512-rlHcWYZn6Ym3v/u0DvKNDiD7ogIzEsHlerm0lowTiQbszkFobOiUClRTALwvsUZdAAztl706qO1OKbnGnD6Ubw==} - engines: {node: '>=14.0.0'} + /@aws-sdk/middleware-sdk-s3@3.682.0: + resolution: {integrity: sha512-Tqndx8elRD4xDR8f5Cng6jpZ/odcm1ZTOtGRFMzHgOCij4BeMf4+/+ecQScobcrAZpUTCUTCzaTvdCdJw8MYJA==} + engines: {node: '>=16.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 + '@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.8 + '@smithy/util-stream': 3.2.1 + '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 - /@aws-sdk/middleware-ssec@3.489.0: - resolution: {integrity: sha512-5RQg8dqERAmi1OfVEV9fbTA5NKmcvKDYP79YtH08IEFIsHWU1Y5NoqL7mXkkNyBrJNBVyasYijAbTzOuM707eg==} - engines: {node: '>=14.0.0'} + /@aws-sdk/middleware-ssec@3.679.0: + resolution: {integrity: sha512-4GNUxXbs1M71uFHRiCAZtN0/g23ogI9YjMe5isAuYMHXwDB3MhqF7usKf954mBP6tplvN44vYlbJ84faaLrTtg==} + engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/types': 2.8.0 + '@aws-sdk/types': 3.679.0 + '@smithy/types': 3.6.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'} + /@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.489.0 - '@aws-sdk/util-endpoints': 3.489.0 - '@smithy/protocol-http': 3.0.12 - '@smithy/types': 2.8.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.489.0: - resolution: {integrity: sha512-UvrnB78XTz9ddby7mr0vuUHn2MO3VTjzaIu+GQhyedMGQU0QlIQrYOlzbbu4LC5rL1O8FxFLUxRe/AAjgwyuGw==} - engines: {node: '>=14.0.0'} + /@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.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 + '@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.8 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'} + /@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.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 + '@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.489.0: - resolution: {integrity: sha512-hSgjB8CMQoA8EIQ0ripDjDtbBcWDSa+7vSBYPIzksyknaGERR/GUfGXLV2dpm5t17FgFG6irT5f3ZlBzarL8Dw==} - engines: {node: '>=14.0.0'} + /@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.679.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 + '@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 - transitivePeerDependencies: - - aws-crt - /@aws-sdk/types@3.489.0: - resolution: {integrity: sha512-kcDtLfKog/p0tC4gAeqJqWxAiEzfe2LRPnKamvSG2Mjbthx4R/alE2dxyIq/wW+nvRv0fqR3OD5kD1+eVfdr/w==} - engines: {node: '>=14.0.0'} + /@aws-sdk/types@3.679.0: + resolution: {integrity: sha512-NwVq8YvInxQdJ47+zz4fH3BRRLC6lL+WLkvr242PVBbUOLRyK/lkwHlfiKUoeVIMyK5NF+up6TRg71t/8Bny6Q==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 2.8.0 + '@smithy/types': 3.6.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'} + /@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.489.0: - resolution: {integrity: sha512-uGyG1u84ATX03mf7bT4xD9XD/vlYJGD5+RxMN/UpzeTfzXfh+jvCQWbOQ44z8ttFJWYQQqrLxkfpF/JgvALzLA==} - engines: {node: '>=14.0.0'} + /@aws-sdk/util-endpoints@3.679.0: + resolution: {integrity: sha512-YL6s4Y/1zC45OvddvgE139fjeWSKKPgLlnfrvhVL7alNyY9n7beR4uhoDpNrt5mI6sn9qiBF17790o+xLAXjjg==} + engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/types': 2.8.0 - '@smithy/util-endpoints': 1.0.8 + '@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: @@ -1863,39 +1888,60 @@ packages: dependencies: tslib: 2.6.2 - /@aws-sdk/util-user-agent-browser@3.489.0: - resolution: {integrity: sha512-85B9KMsuMpAZauzWQ16r52ZBAHYnznW6BVitnBglsibN7oJKn10Hggt4QGuRhvQFCxQ8YhvBl7r+vQGFO4hxIw==} + /@aws-sdk/util-user-agent-browser@3.679.0: + resolution: {integrity: sha512-CusSm2bTBG1kFypcsqU8COhnYc6zltobsqs3nRrvYqYaOqtMnuE46K4XTWpnzKgwDejgZGOE+WYyprtAxrPvmQ==} dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/types': 2.8.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.489.0: - resolution: {integrity: sha512-CYdkBHig8sFNc0dv11Ni9WXvZQHeI5+z77OrDHKkbidFx/V4BDTuwZw4K1vWg62pzFOEfzunJFiULRcDZWJR3w==} - engines: {node: '>=14.0.0'} + /@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' peerDependenciesMeta: aws-crt: optional: true dependencies: - '@aws-sdk/types': 3.489.0 - '@smithy/node-config-provider': 2.1.9 - '@smithy/types': 2.8.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/util-utf8-browser@3.259.0: - resolution: {integrity: sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==} + /@aws-sdk/xml-builder@3.679.0: + resolution: {integrity: sha512-nPmhVZb39ty5bcQ7mAwtjezBcsBqTYZ9A2D9v/lE92KCLdu5RhSkPH7O71ZqbZx1mUSg9fAOxHPiG79U5VlpLQ==} + engines: {node: '>=16.0.0'} dependencies: + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/xml-builder@3.485.0: - resolution: {integrity: sha512-xQexPM6LINOIkf3NLFywplcbApifZRMWFN41TDWYSNgCUa5uC9fntfenw8N/HTx1n+McRCWSAFBTjDqY/2OLCQ==} - engines: {node: '>=14.0.0'} + /@azure-rest/ai-translation-text@1.0.0: + resolution: {integrity: sha512-Zt1nwHdvfEzM6EVnx4cLz6GNYS5gxYWbwA3dAr6+NM9CWb3vk+p2Vy/mleU53OSeJvkzhpjXJ78qiJh42JmcXA==} + engines: {node: '>=18.0.0'} dependencies: - '@smithy/types': 2.8.0 + '@azure-rest/core-client': 1.4.0 + '@azure/core-auth': 1.5.0 + '@azure/core-rest-pipeline': 1.17.0 + '@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.17.0 + '@azure/core-tracing': 1.2.0 + '@azure/core-util': 1.6.1 + tslib: 2.6.2 + transitivePeerDependencies: + - supports-color /@azure/abort-controller@1.1.0: resolution: {integrity: sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==} @@ -1903,6 +1949,12 @@ packages: 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'} @@ -1911,26 +1963,37 @@ packages: '@azure/core-util': 1.6.1 tslib: 2.6.2 - /@azure/core-http@3.0.4: - resolution: {integrity: sha512-Fok9VVhMdxAFOtqiiAtg74fL0UJkt0z3D+ouUUxcRLzZNBioPRAMJFVxiWoJljYpXsRi4GDQHzQHDc9AiYaIUQ==} - engines: {node: '>=14.0.0'} + /@azure/core-auth@1.9.0: + resolution: {integrity: sha512-FPwHpZywuyasDSLMqJ6fhbOK3TqUdviZNF8OqRGA4W5Ewib2lEEZ+pBsYcBa88B2NGO/SEnYPGhyBqNlE8ilSw==} + engines: {node: '>=18.0.0'} dependencies: - '@azure/abort-controller': 1.1.0 + '@azure/abort-controller': 2.1.2 + '@azure/core-util': 1.11.0 + 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-tracing': 1.0.0-preview.13 + '@azure/core-rest-pipeline': 1.17.0 + '@azure/core-tracing': 1.2.0 '@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 + - 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.17.0 + transitivePeerDependencies: + - supports-color /@azure/core-lro@2.5.4: resolution: {integrity: sha512-3GJiMVH7/10bulzOKGrrLeG/uCBH/9VtxqaMcB9lIqAeamI/xYQSHJL/KcsLDuH+yTjYpro/u6D/MuRe4dN70Q==} @@ -1947,11 +2010,38 @@ 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'} + /@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.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 + 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.2.0: + resolution: {integrity: sha512-UKTiEJPkWcESPYJz3X5uKRYyOcJD+4nYph+KpfdPRnQJVrZfk0KJgdnaAWKfhsBBtAf/D58Az4AvCJEmWgIBAg==} + engines: {node: '>=18.0.0'} dependencies: - '@opentelemetry/api': 1.7.0 + tslib: 2.6.2 + + /@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-util@1.6.1: @@ -1961,26 +2051,52 @@ packages: '@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.5.0 + 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/storage-blob@12.17.0: - resolution: {integrity: sha512-sM4vpsCpcCApagRW5UIjQNlNylo02my2opgp0Emi8x888hZUvJ3dN69Oq20cEGXkMUWnoCrBaB0zyS3yeB87sQ==} - engines: {node: '>=14.0.0'} + /@azure/openai@1.0.0-beta.11: + resolution: {integrity: sha512-OXS27xkG1abiGf5VZUKnkJKr1VCo8+6EUrTGW5aSVjc5COqX8jAUqVAOZsQVCHBdtWYSBULlZkc0ncKMTRQAiQ==} + engines: {node: '>=18.0.0'} dependencies: - '@azure/abort-controller': 1.1.0 - '@azure/core-http': 3.0.4 + '@azure-rest/core-client': 1.4.0 + '@azure/core-auth': 1.5.0 + '@azure/core-rest-pipeline': 1.17.0 + '@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.25.0: + resolution: {integrity: sha512-oodouhA3nCCIh843tMMbxty3WqfNT+Vgzj3Xo5jqR9UPnzq3d7mzLjlHAYz7lW+b4km3SIgz+NAgztvhm7Z6kQ==} + engines: {node: '>=18.0.0'} + dependencies: + '@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-tracing': 1.0.0-preview.13 + '@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 transitivePeerDependencies: - - encoding + - supports-color /@babel/cli@7.23.4(@babel/core@7.23.7): resolution: {integrity: sha512-j3luA9xGKCXVyCa5R7lJvOMM+Kc2JEnAEIgz2ggtjQ/j5YUVgfsg/WsG95bbsgq7YLHuiCOzMnoSasuY16qiCw==} @@ -2049,6 +2165,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==} @@ -2165,6 +2282,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==} @@ -2520,6 +2638,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==} @@ -3406,24 +3525,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'} @@ -3633,8 +3734,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.5.0(@babel/cli@7.23.4): + resolution: {integrity: sha512-l4eyqqlZJOt8XSVA67qFglTYlYHuok9lhuPFStKhtebFRw91p6ft5D3uWmZDcjTpsULSOW5jzOy9TfK4VsPiuA==} peerDependencies: '@babel/cli': '>= 7' dependencies: @@ -3649,20 +3750,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.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 - '@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.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/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 @@ -3670,12 +3769,12 @@ 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' - '@emotion/styled' - - '@mui/icons-material' + - '@mui/system' - '@mui/x-data-grid' - '@mui/x-data-grid-premium' - '@mui/x-data-grid-pro' @@ -3687,8 +3786,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.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 @@ -3697,25 +3796,23 @@ 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@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.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/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.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/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) @@ -3726,11 +3823,12 @@ 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' - '@emotion/styled' + - '@mui/system' - '@mui/x-data-grid' - '@mui/x-data-grid-premium' - '@mui/x-data-grid-pro' @@ -3741,17 +3839,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.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/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.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/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 @@ -3759,15 +3855,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.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 '@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 @@ -3778,7 +3872,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: @@ -3789,14 +3883,14 @@ packages: react-dnd: 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) + '@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) '@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 @@ -3813,33 +3907,33 @@ 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-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) 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.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 - '@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.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) - '@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 @@ -3847,7 +3941,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 @@ -3857,7 +3951,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' @@ -3866,46 +3960,36 @@ 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.5.0(@nestjs/common@9.4.3): + resolution: {integrity: sha512-GSsCfIbSMFYTqzl9f5PGAcz+ne+C3mROlUJTUexMfhscUsr6IaHp2qU9MiMUpilKlxIQl5Ourf9wuMFHnLNeQA==} 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 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==} + /@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 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@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/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: '@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 @@ -3913,28 +3997,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) + '@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.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.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) '@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 @@ -3951,6 +4034,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 @@ -3962,10 +4046,9 @@ 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) + 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) @@ -3981,48 +4064,52 @@ packages: - '@mui/x-data-grid-premium' - '@mui/x-data-grid-pro' - '@types/react' + - debug - 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.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: - '@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.682.0 + '@azure-rest/ai-translation-text': 1.0.0 + '@azure/openai': 1.0.0-beta.11 + '@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) '@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) - '@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) '@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 @@ -4040,7 +4127,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 @@ -4055,7 +4142,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 @@ -4067,49 +4153,30 @@ packages: uuid: 9.0.1 uuid-by-string: 4.0.0 transitivePeerDependencies: + - aws-crt - 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@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: - next: ^12.0.0 - react: ^17.0.0 - react-dom: ^17.0.0 - styled-components: ^5.0.0 + '@types/react': ^18.0.0 + next: ^14.2.0 + 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) + '@types/react': 18.3.12 + 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 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@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 + server-only: 0.0.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 /@comet/dev-process-manager@2.5.1: @@ -4131,24 +4198,25 @@ 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==} + /@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' 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.5.0(eslint@8.56.0) + '@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: 13.5.6(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) 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) @@ -4157,34 +4225,36 @@ 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: 12.3.4(@babel/core@7.23.7)(react-dom@17.0.2)(react@17.0.2) + 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: - - 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@27.1.5)(typescript@4.9.5): - resolution: {integrity: sha512-Spr1+2qp/EzDGrrjGlI3hXrdeqr9lXU02TTIzqkcK+CR/AhR3SDA5cCVLdJiYt8BxR1G5Y0M/wAZYePgje8TcA==} + /@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: '*' - 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.5.0(eslint@8.56.0) + '@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: 13.5.6(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) 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) @@ -4193,33 +4263,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.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: '*' - 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.5.0(eslint@8.56.0) + '@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: 13.5.6(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) 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) @@ -4228,17 +4300,18 @@ 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-plugin@6.8.0(eslint@8.56.0): - resolution: {integrity: sha512-g70w5dSCAlT0PpDRJRH3mV6S+efDo4v4a64UImWvy3LyV1r1PI+p+v5zHamNcsL5YFR1fPETicAsWXyzR88mmg==} + /@comet/eslint-plugin@7.5.0(eslint@8.56.0): + resolution: {integrity: sha512-DjlUrCyXSd9OjB9TTSLHFv7eZY8toG4AXQSlCvcl9brLnYJMm2fR+LN5h2oHeYAg6WamkXY1oN0VkZLORh91GQ==} peerDependencies: eslint: '8' dependencies: @@ -4287,6 +4360,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==} @@ -4342,14 +4421,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==} @@ -4399,6 +4470,21 @@ packages: resolution: {integrity: sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@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 + 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'} @@ -4460,8 +4546,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.1.0: + resolution: {integrity: sha512-TwH8+uOwBqIjxtvTc+kp7ywyH7V7bDLbAXrEQg2SoCTJ6m2pn00x7ULioTTzDEvek+XpbqIf8gbKE1zlcONNGg==} dev: false /@formatjs/cli@3.2.0: @@ -5533,7 +5619,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==} @@ -6036,15 +6121,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: @@ -6067,8 +6152,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: @@ -6105,10 +6190,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 @@ -6123,8 +6208,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 @@ -6159,18 +6244,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 @@ -6200,8 +6285,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 @@ -6211,14 +6296,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 @@ -6234,7 +6319,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: @@ -6242,12 +6327,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 @@ -6262,10 +6347,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 @@ -6421,36 +6507,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'} @@ -6847,119 +6903,81 @@ packages: - utf-8-validate dev: false - /@next/env@12.3.4: - resolution: {integrity: sha512-H/69Lc5Q02dq3o+dxxy5O/oNxFsZpdL6WREtOOtOM1B/weonIwDXkekr1KV5DPVPr12IHFPrMrcJQ6bgPMfn7A==} - - /@next/eslint-plugin-next@12.3.4: - resolution: {integrity: sha512-BFwj8ykJY+zc1/jWANsDprDIu2MgwPOIKxNVnrKvPs+f5TPegrVnem8uScND+1veT4B7F6VeqgaNLFW1Hzl9Og==} - dependencies: - glob: 7.1.7 - dev: true + /@next/env@14.2.16: + resolution: {integrity: sha512-fLrX5TfJzHCbnZ9YUSnGW63tMV3L4nSfhgOQ0iCcX21Pt+VSTDuaLsSuL8J/2XAiVA5AnzvXDpf6pMs60QxOag==} - /@next/eslint-plugin-next@13.5.6: - resolution: {integrity: sha512-ng7pU/DDsxPgT6ZPvuprxrkeew3XaRf4LAT4FabaEO/hAbvVx4P7wqnqdbTdDn1kgTvsI4tpIgT4Awn/m0bGbg==} + /@next/eslint-plugin-next@14.2.16: + resolution: {integrity: sha512-noORwKUMkKc96MWjTOwrsUCjky0oFegHbeJ1yEnQBGbMHAaTEIgLZIIfsYF0x3a06PiS+2TXppfifR+O6VWslg==} dependencies: - glob: 7.1.7 + 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==} + /@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@12.3.4: - resolution: {integrity: sha512-PPF7tbWD4k0dJ2EcUSnOsaOJ5rhT3rlEt/3LhZUGiYNL8KvoqczFrETlUx0cUYaXe11dRA3F80Hpt727QIwByQ==} + /@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-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==} + /@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@12.3.4: - resolution: {integrity: sha512-EETZPa1juczrKLWk5okoW2hv7D7WvonU+Cf2CgsSoxgsYbUCZ1voOpL4JZTOb6IbKMDo6ja+SbY0vzXZBUMvkQ==} + /@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@12.3.4: - resolution: {integrity: sha512-4csPbRbfZbuWOk3ATyWcvVFdD9/Rsdq5YHKvRuEni68OCLkfy4f+4I9OBpyK1SKJ00Cih16NJbHE+k+ljPPpag==} + /@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@12.3.4: - resolution: {integrity: sha512-YeBmI+63Ro75SUiL/QXEVXQ19T++58aI/IINOyhpsRL1LKdyfK/35iilraZEFz9bLQrwy1LYAR5lK200A9Gjbg==} + /@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@12.3.4: - resolution: {integrity: sha512-Sd0qFUJv8Tj0PukAYbCCDbmXcMkbIuhnTeHm9m4ZGjCf6kt7E/RMs55Pd3R5ePjOkN7dJEuxYBehawTR/aPDSQ==} + /@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@12.3.4: - resolution: {integrity: sha512-rt/vv/vg/ZGGkrkKcuJ0LyliRdbskQU+91bje+PgoYmxTZf/tYs6IfbmgudBJk6gH3QnjHWbkphDdRQrseRefQ==} + /@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@12.3.4: - resolution: {integrity: sha512-DQ20JEfTBZAgF8QCjYfJhv2/279M6onxFjdG/+5B0Cyj00/EdBxiWb2eGGFgQhrBbNv/lsvzFbbi0Ptf8Vw/bg==} + /@next/swc-win32-x64-msvc@14.2.16: + resolution: {integrity: sha512-OA7NtfxgirCjfqt+02BqxC3MIgM/JaGjw9tOe4fyZgPsqfseNiMPnCRP44Pfs+Gpo9zPN+SXaFsgP6vk8d571A==} engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -7989,7 +8007,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: @@ -8114,134 +8131,143 @@ 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'} + /@smithy/abort-controller@3.1.6: + resolution: {integrity: sha512-0XuhuHQlEqbNQZp7QxxrFTdVWdwxch4vjxYgfInF91hZFkPxf9QDrdQka0KfxFMPqLNzSw0b95uGTrLliQUavQ==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 2.8.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/chunked-blob-reader-native@2.0.1: - resolution: {integrity: sha512-N2oCZRglhWKm7iMBu7S6wDzXirjAofi7tAd26cxmgibRYOBS4D3hGfmkwCpHdASZzwZDD8rluh0Rcqw1JeZDRw==} + /@smithy/chunked-blob-reader-native@3.0.1: + resolution: {integrity: sha512-VEYtPvh5rs/xlyqpm5NRnfYLZn+q0SRPELbvBV+C/G7IQ+ouTuo+NKKa3ShG5OaFR8NYVMXls9hPYLTvIKKDrQ==} dependencies: - '@smithy/util-base64': 2.0.1 + '@smithy/util-base64': 3.0.0 tslib: 2.6.2 - /@smithy/chunked-blob-reader@2.0.0: - resolution: {integrity: sha512-k+J4GHJsMSAIQPChGBrjEmGS+WbPonCXesoqP9fynIqjn7rdOThdH8FAeCmokP9mxTYKQAKoHCLPzNlm6gh7Wg==} + /@smithy/chunked-blob-reader@4.0.0: + resolution: {integrity: sha512-jSqRnZvkT4egkq/7b6/QRCNXmmYVcHwnJldqJ3IhVpQE2atObVJ137xmGeuGFhjFUr8gCEVAOKwSY79OvpbDaQ==} dependencies: tslib: 2.6.2 - /@smithy/config-resolver@2.0.23: - resolution: {integrity: sha512-XakUqgtP2YY8Mi+Nlif5BiqJgWdvfxJafSpOSQeCOMizu+PUhE4fBQSy6xFcR+eInrwVadaABNxoJyGUMn15ew==} - engines: {node: '>=14.0.0'} + /@smithy/config-resolver@3.0.10: + resolution: {integrity: sha512-Uh0Sz9gdUuz538nvkPiyv1DZRX9+D15EKDtnQP5rYVAzM/dnYk3P8cg73jcxyOitPgT3mE3OVj7ky7sibzHWkw==} + engines: {node: '>=16.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 + '@smithy/node-config-provider': 3.1.9 + '@smithy/types': 3.6.0 + '@smithy/util-config-provider': 3.0.0 + '@smithy/util-middleware': 3.0.8 tslib: 2.6.2 - /@smithy/core@1.2.2: - resolution: {integrity: sha512-uLjrskLT+mWb0emTR5QaiAIxVEU7ndpptDaVDrTwwhD+RjvHhjIiGQ3YL5jKk1a5VSDQUA2RGkXvJ6XKRcz6Dg==} - engines: {node: '>=14.0.0'} + /@smithy/core@2.5.1: + resolution: {integrity: sha512-DujtuDA7BGEKExJ05W5OdxCoyekcKT3Rhg1ZGeiUWaz2BJIWXjZmsG/DIP4W48GHno7AQwRsaCb8NcBgH3QZpg==} + engines: {node: '>=16.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 + '@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.8 + '@smithy/util-stream': 3.2.1 + '@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'} + /@smithy/credential-provider-imds@3.2.5: + resolution: {integrity: sha512-4FTQGAsuwqTzVMmiRVTn0RR9GrbRfkP0wfu/tXWVHd2LgNpTY0uglQpIScXK4NaEyXbB3JmZt8gfVqO50lP8wg==} + engines: {node: '>=16.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 + '@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@2.0.16: - resolution: {integrity: sha512-umYh5pdCE9GHgiMAH49zu9wXWZKNHHdKPm/lK22WYISTjqu29SepmpWNmPiBLy/yUu4HFEGJHIFrDWhbDlApaw==} + /@smithy/eventstream-codec@3.1.7: + resolution: {integrity: sha512-kVSXScIiRN7q+s1x7BrQtZ1Aa9hvvP9FeCqCdBxv37GimIHgBCOnZ5Ip80HLt0DhnAKpiobFdGqTFgbaJNrazA==} dependencies: - '@aws-crypto/crc32': 3.0.0 - '@smithy/types': 2.8.0 - '@smithy/util-hex-encoding': 2.0.0 + '@aws-crypto/crc32': 5.2.0 + '@smithy/types': 3.6.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'} + /@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': 2.0.16 - '@smithy/types': 2.8.0 + '@smithy/eventstream-serde-universal': 3.0.10 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/eventstream-serde-config-resolver@2.0.16: - resolution: {integrity: sha512-8qrE4nh+Tg6m1SMFK8vlzoK+8bUFTlIhXidmmQfASMninXW3Iu0T0bI4YcIk4nLznHZdybQ0qGydIanvVZxzVg==} - engines: {node: '>=14.0.0'} + /@smithy/eventstream-serde-config-resolver@3.0.8: + resolution: {integrity: sha512-zkFIG2i1BLbfoGQnf1qEeMqX0h5qAznzaZmMVNnvPZz9J5AWBPkOMckZWPedGUPcVITacwIdQXoPcdIQq5FRcg==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 2.8.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/eventstream-serde-node@2.0.16: - resolution: {integrity: sha512-NRNQuOa6mQdFSkqzY0IV37swHWx0SEoKxFtUfdZvfv0AVQPlSw4N7E3kcRSCpnHBr1kCuWWirdDlWcjWuD81MA==} - engines: {node: '>=14.0.0'} + /@smithy/eventstream-serde-node@3.0.10: + resolution: {integrity: sha512-hjpU1tIsJ9qpcoZq9zGHBJPBOeBGYt+n8vfhDwnITPhEre6APrvqq/y3XMDEGUT2cWQ4ramNqBPRbx3qn55rhw==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/eventstream-serde-universal': 2.0.16 - '@smithy/types': 2.8.0 + '@smithy/eventstream-serde-universal': 3.0.10 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/eventstream-serde-universal@2.0.16: - resolution: {integrity: sha512-ZyLnGaYQMLc75j9kKEVMJ3X6bdBE9qWxhZdTXM5RIltuytxJC3FaOhawBxjE+IL1enmWSIohHGZCm/pLwEliQA==} - engines: {node: '>=14.0.0'} + /@smithy/eventstream-serde-universal@3.0.10: + resolution: {integrity: sha512-ewG1GHbbqsFZ4asaq40KmxCmXO+AFSM1b+DcO2C03dyJj/ZH71CiTg853FSE/3SHK9q3jiYQIFjlGSwfxQ9kww==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/eventstream-codec': 2.0.16 - '@smithy/types': 2.8.0 + '@smithy/eventstream-codec': 3.1.7 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/fetch-http-handler@2.3.2: - resolution: {integrity: sha512-O9R/OlnAOTsnysuSDjt0v2q6DcSvCz5cCFC/CFAWWcLyBwJDeFyGTCTszgpQTb19+Fi8uRwZE5/3ziAQBFeDMQ==} + /@smithy/fetch-http-handler@3.2.9: + resolution: {integrity: sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A==} dependencies: - '@smithy/protocol-http': 3.0.12 - '@smithy/querystring-builder': 2.0.16 - '@smithy/types': 2.8.0 - '@smithy/util-base64': 2.0.1 + '@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@2.0.17: - resolution: {integrity: sha512-/mPpv1sRiRDdjO4zZuO8be6eeabmg5AVgKDfnmmqkpBtRyMGSJb968fjRuHt+FRAsIGywgIKJFmUUAYjhsi1oQ==} + /@smithy/fetch-http-handler@4.0.0: + resolution: {integrity: sha512-MLb1f5tbBO2X6K4lMEKJvxeLooyg7guq48C2zKr4qM7F2Gpkz4dc+hdSgu77pCJ76jVqFBjZczHYAs6dp15N+g==} dependencies: - '@smithy/chunked-blob-reader': 2.0.0 - '@smithy/chunked-blob-reader-native': 2.0.1 - '@smithy/types': 2.8.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@2.0.18: - resolution: {integrity: sha512-gN2JFvAgnZCyDN9rJgcejfpK0uPPJrSortVVVVWsru9whS7eQey6+gj2eM5ln2i6rHNntIXzal1Fm9XOPuoaKA==} - engines: {node: '>=14.0.0'} + /@smithy/hash-blob-browser@3.1.7: + resolution: {integrity: sha512-4yNlxVNJifPM5ThaA5HKnHkn7JhctFUHvcaz6YXxHlYOSIrzI6VKQPTN8Gs1iN5nqq9iFcwIR9THqchUCouIfg==} dependencies: - '@smithy/types': 2.8.0 - '@smithy/util-buffer-from': 2.0.0 - '@smithy/util-utf8': 2.0.2 + '@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-stream-node@2.0.18: - resolution: {integrity: sha512-OuFk+ITpv8CtxGjQcS8GA04faNycu9UMm6YobvQzjeEoXZ0dLF6sRfuzD+3S8RHPKpTyLuXtKG1+GiJycZ5TcA==} - engines: {node: '>=14.0.0'} + /@smithy/hash-node@3.0.8: + resolution: {integrity: sha512-tlNQYbfpWXHimHqrvgo14DrMAgUBua/cNoz9fMYcDmYej7MAmUcjav/QKQbFc3NrcPxeJ7QClER4tWZmfwoPng==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 2.8.0 - '@smithy/util-utf8': 2.0.2 + '@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.7: + resolution: {integrity: sha512-xMAsvJ3hLG63lsBVi1Hl6BBSfhd8/Qnp8fC06kjOpJvyyCEXdwHITa5Kvdsk6gaAXLhbZMhQMIGvgUbfnJDP6Q==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/types': 3.6.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==} + /@smithy/invalid-dependency@3.0.8: + resolution: {integrity: sha512-7Qynk6NWtTQhnGTTZwks++nJhQ1O54Mzi7fz4PqZOiYXb4Z1Flpb2yRvdALoggTS8xjtohWUM+RygOtB30YL3Q==} dependencies: - '@smithy/types': 2.8.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 /@smithy/is-array-buffer@2.0.0: @@ -8250,174 +8276,183 @@ packages: dependencies: tslib: 2.6.2 - /@smithy/md5-js@2.0.18: - resolution: {integrity: sha512-bHwZ8/m6RbERQdVW5rJ2LzeW8qxfXv6Q/S7Fiudhso4pWRrksqLx3nsGZw7bmqqfN4zLqkxydxSa9+4c7s5zxg==} + /@smithy/is-array-buffer@3.0.0: + resolution: {integrity: sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 2.8.0 - '@smithy/util-utf8': 2.0.2 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'} + /@smithy/md5-js@3.0.8: + resolution: {integrity: sha512-LwApfTK0OJ/tCyNUXqnWCKoE2b4rDSr4BJlDAVCkiWYeHESr+y+d5zlAanuLW6fnitVJRD/7d9/kN/ZM9Su4mA==} dependencies: - '@smithy/protocol-http': 3.0.12 - '@smithy/types': 2.8.0 + '@smithy/types': 3.6.0 + '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 - /@smithy/middleware-endpoint@2.3.0: - resolution: {integrity: sha512-VsOAG2YQ8ykjSmKO+CIXdJBIWFo6AAvG6Iw95BakBTqk66/4BI7XyqLevoNSq/lZ6NgZv24sLmrcIN+fLDWBCg==} - engines: {node: '>=14.0.0'} + /@smithy/middleware-content-length@3.0.10: + resolution: {integrity: sha512-T4dIdCs1d/+/qMpwhJ1DzOhxCZjZHbHazEPJWdB4GDi2HjIZllVzeBEcdJUN0fomV8DURsgOyrbEUzg3vzTaOg==} + engines: {node: '>=16.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 + '@smithy/protocol-http': 4.1.5 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/middleware-retry@2.0.26: - resolution: {integrity: sha512-Qzpxo0U5jfNiq9iD38U3e2bheXwvTEX4eue9xruIvEgh+UKq6dKuGqcB66oBDV7TD/mfoJi9Q/VmaiqwWbEp7A==} - engines: {node: '>=14.0.0'} + /@smithy/middleware-endpoint@3.2.1: + resolution: {integrity: sha512-wWO3xYmFm6WRW8VsEJ5oU6h7aosFXfszlz3Dj176pTij6o21oZnzkCLzShfmRaaCHDkBXWBdO0c4sQAvLFP6zA==} + engines: {node: '>=16.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 + '@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 - uuid: 8.3.2 - /@smithy/middleware-serde@2.0.16: - resolution: {integrity: sha512-5EAd4t30pcc4M8TSSGq7q/x5IKrxfXR5+SrU4bgxNy7RPHQo2PSWBUco9C+D9Tfqp/JZvprRpK42dnupZafk2g==} - engines: {node: '>=14.0.0'} + /@smithy/middleware-retry@3.0.25: + resolution: {integrity: sha512-m1F70cPaMBML4HiTgCw5I+jFNtjgz5z5UdGnUbG37vw6kh4UvizFYjqJGHvicfgKMkDL6mXwyPp5mhZg02g5sg==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 2.8.0 + '@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-stack@2.0.10: - resolution: {integrity: sha512-I2rbxctNq9FAPPEcuA1ntZxkTKOPQFy7YBPOaD/MLg1zCvzv21CoNxR0py6J8ZVC35l4qE4nhxB0f7TF5/+Ldw==} - engines: {node: '>=14.0.0'} + /@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': 2.8.0 + '@smithy/types': 3.6.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'} + /@smithy/middleware-stack@3.0.8: + resolution: {integrity: sha512-d7ZuwvYgp1+3682Nx0MD3D/HtkmZd49N3JUndYWQXfRZrYEnCWYc8BHcNmVsPAp9gKvlurdg/mubE6b/rPS9MA==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/property-provider': 2.0.17 - '@smithy/shared-ini-file-loader': 2.2.8 - '@smithy/types': 2.8.0 + '@smithy/types': 3.6.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'} + /@smithy/node-config-provider@3.1.9: + resolution: {integrity: sha512-qRHoah49QJ71eemjuS/WhUXB+mpNtwHRWQr77J/m40ewBVVwvo52kYAmb7iuaECgGTTcYxHS4Wmewfwy++ueew==} + engines: {node: '>=16.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 + '@smithy/property-provider': 3.1.8 + '@smithy/shared-ini-file-loader': 3.1.9 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/property-provider@2.0.17: - resolution: {integrity: sha512-+VkeZbVu7qtQ2DjI48Qwaf9fPOr3gZIwxQpuLJgRRSkWsdSvmaTCxI3gzRFKePB63Ts9r4yjn4HkxSCSkdWmcQ==} - engines: {node: '>=14.0.0'} + /@smithy/node-http-handler@3.2.5: + resolution: {integrity: sha512-PkOwPNeKdvX/jCpn0A8n9/TyoxjGZB8WVoJmm9YzsnAgggTj4CrjpRHlTQw7dlLZ320n1mY1y+nTRUDViKi/3w==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 2.8.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/protocol-http@3.0.12: - resolution: {integrity: sha512-Xz4iaqLiaBfbQpB9Hgi3VcZYbP7xRDXYhd8XWChh4v94uw7qwmvlxdU5yxzfm6ACJM66phHrTbS5TVvj5uQ72w==} - engines: {node: '>=14.0.0'} + /@smithy/property-provider@3.1.8: + resolution: {integrity: sha512-ukNUyo6rHmusG64lmkjFeXemwYuKge1BJ8CtpVKmrxQxc6rhUX0vebcptFA9MmrGsnLhwnnqeH83VTU9hwOpjA==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 2.8.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/querystring-builder@2.0.16: - resolution: {integrity: sha512-Q/GsJT0C0mijXMRs7YhZLLCP5FcuC4797lYjKQkME5CZohnLC4bEhylAd2QcD3gbMKNjCw8+T2I27WKiV/wToA==} - engines: {node: '>=14.0.0'} + /@smithy/protocol-http@4.1.5: + resolution: {integrity: sha512-hsjtwpIemmCkm3ZV5fd/T0bPIugW1gJXwZ/hpuVubt2hEUApIoUTrf6qIdh9MAWlw0vjMrA1ztJLAwtNaZogvg==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 2.8.0 - '@smithy/util-uri-escape': 2.0.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/querystring-parser@2.0.16: - resolution: {integrity: sha512-c4ueAuL6BDYKWpkubjrQthZKoC3L5kql5O++ovekNxiexRXTlLIVlCR4q3KziOktLIw66EU9SQljPXd/oN6Okg==} - engines: {node: '>=14.0.0'} + /@smithy/querystring-builder@3.0.8: + resolution: {integrity: sha512-btYxGVqFUARbUrN6VhL9c3dnSviIwBYD9Rz1jHuN1hgh28Fpv2xjU1HeCeDJX68xctz7r4l1PBnFhGg1WBBPuA==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 2.8.0 + '@smithy/types': 3.6.0 + '@smithy/util-uri-escape': 3.0.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'} + /@smithy/querystring-parser@3.0.8: + resolution: {integrity: sha512-BtEk3FG7Ks64GAbt+JnKqwuobJNX8VmFLBsKIwWr1D60T426fGrV2L3YS5siOcUhhp6/Y6yhBw1PSPxA5p7qGg==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 2.8.0 + '@smithy/types': 3.6.0 + tslib: 2.6.2 - /@smithy/shared-ini-file-loader@2.2.8: - resolution: {integrity: sha512-E62byatbwSWrtq9RJ7xN40tqrRKDGrEL4EluyNpaIDvfvet06a/QC58oHw2FgVaEgkj0tXZPjZaKrhPfpoU0qw==} - engines: {node: '>=14.0.0'} + /@smithy/service-error-classification@3.0.8: + resolution: {integrity: sha512-uEC/kCCFto83bz5ZzapcrgGqHOh/0r69sZ2ZuHlgoD5kYgXJEThCoTuw/y1Ub3cE7aaKdznb+jD9xRPIfIwD7g==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/types': 3.6.0 + + /@smithy/shared-ini-file-loader@3.1.9: + resolution: {integrity: sha512-/+OsJRNtoRbtsX0UpSgWVxFZLsJHo/4sTr+kBg/J78sr7iC+tHeOvOJrS5hCpVQ6sWBbhWLp1UNiuMyZhE6pmA==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 2.8.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/signature-v4@2.0.19: - resolution: {integrity: sha512-nwc3JihdM+kcJjtORv/n7qRHN2Kfh7S2RJI2qr8pz9UcY5TD8rSCRGQ0g81HgyS3jZ5X9U/L4p014P3FonBPhg==} - engines: {node: '>=14.0.0'} + /@smithy/signature-v4@4.2.1: + resolution: {integrity: sha512-NsV1jF4EvmO5wqmaSzlnTVetemBS3FZHdyc5CExbDljcyJCEEkJr8ANu2JvtNbVg/9MvKAWV44kTrGS+Pi4INg==} + engines: {node: '>=16.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 + '@smithy/is-array-buffer': 3.0.0 + '@smithy/protocol-http': 4.1.5 + '@smithy/types': 3.6.0 + '@smithy/util-hex-encoding': 3.0.0 + '@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@2.2.1: - resolution: {integrity: sha512-SpD7FLK92XV2fon2hMotaNDa2w5VAy5/uVjP9WFmjGSgWM8pTPVkHcDl1yFs5Z8LYbij0FSz+DbCBK6i+uXXUA==} - engines: {node: '>=14.0.0'} + /@smithy/smithy-client@3.4.2: + resolution: {integrity: sha512-dxw1BDxJiY9/zI3cBqfVrInij6ShjpV4fmGHesGZZUiP9OSE/EVfdwdRz0PgvkEvrZHpsj2htRaHJfftE8giBA==} + engines: {node: '>=16.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 + '@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@2.8.0: - resolution: {integrity: sha512-h9sz24cFgt/W1Re22OlhQKmUZkNh244ApgRsUDYinqF8R+QgcsBIX344u2j61TPshsTz3CvL6HYU1DnQdsSrHA==} - engines: {node: '>=14.0.0'} + /@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@2.0.16: - resolution: {integrity: sha512-Wfz5WqAoRT91TjRy1JeLR0fXtkIXHGsMbgzKFTx7E68SrZ55TB8xoG+vm11Ru4gheFTMXjAjwAxv1jQdC+pAQA==} + /@smithy/url-parser@3.0.8: + resolution: {integrity: sha512-4FdOhwpTW7jtSFWm7SpfLGKIBC9ZaTKG5nBF0wK24aoQKQyDIKUw3+KFWCQ9maMzrgTJIuOvOnsV2lLGW5XjTg==} dependencies: - '@smithy/querystring-parser': 2.0.16 - '@smithy/types': 2.8.0 + '@smithy/querystring-parser': 3.0.8 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/util-base64@2.0.1: - resolution: {integrity: sha512-DlI6XFYDMsIVN+GH9JtcRp3j02JEVuWIn/QOZisVzpIAprdsxGveFed0bjbMRCqmIFe8uetn5rxzNrBtIGrPIQ==} - engines: {node: '>=14.0.0'} + /@smithy/util-base64@3.0.0: + resolution: {integrity: sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/util-buffer-from': 2.0.0 + '@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==} + /@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'} + /@smithy/util-body-length-node@3.0.0: + resolution: {integrity: sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==} + engines: {node: '>=16.0.0'} dependencies: tslib: 2.6.2 @@ -8428,79 +8463,86 @@ packages: '@smithy/is-array-buffer': 2.0.0 tslib: 2.6.2 - /@smithy/util-config-provider@2.1.0: - resolution: {integrity: sha512-S6V0JvvhQgFSGLcJeT1CBsaTR03MM8qTuxMH9WPCCddlSo2W0V5jIHimHtIQALMLEDPGQ0ROSRr/dU0O+mxiQg==} - engines: {node: '>=14.0.0'} + /@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-defaults-mode-browser@2.0.24: - resolution: {integrity: sha512-TsP5mBuLgO2C21+laNG2nHYZEyUdkbGURv2tHvSuQQxLz952MegX95uwdxOY2jR2H4GoKuVRfdJq7w4eIjGYeg==} + /@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@3.0.25: + resolution: {integrity: sha512-fRw7zymjIDt6XxIsLwfJfYUfbGoO9CmCJk6rjJ/X5cd20+d2Is7xjU5Kt/AiDt6hX8DAf5dztmfP5O82gR9emA==} engines: {node: '>= 10.0.0'} dependencies: - '@smithy/property-provider': 2.0.17 - '@smithy/smithy-client': 2.2.1 - '@smithy/types': 2.8.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@2.0.32: - resolution: {integrity: sha512-d0S33dXA2cq1NyorVMroMrEtqKMr3MlyLITcfTBf9pXiigYiPMOtbSI7czHIfDbuVuM89Cg0urAgpt73QV9mPQ==} + /@smithy/util-defaults-mode-node@3.0.25: + resolution: {integrity: sha512-H3BSZdBDiVZGzt8TG51Pd2FvFO0PAx/A0mJ0EH8a13KJ6iUCdYnw/Dk/MdC1kTd0eUuUGisDFaxXVXo4HHFL1g==} 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 + '@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@1.0.8: - resolution: {integrity: sha512-l8zVuyZZ61IzZBYp5NWvsAhbaAjYkt0xg9R4xUASkg5SEeTT2meHOJwJHctKMFUXe4QZbn9fR2MaBYjP2119+w==} - engines: {node: '>= 14.0.0'} + /@smithy/util-endpoints@2.1.4: + resolution: {integrity: sha512-kPt8j4emm7rdMWQyL0F89o92q10gvCUa6sBkBtDJ7nV2+P7wpXczzOfoDJ49CKXe5CCqb8dc1W+ZdLlrKzSAnQ==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/node-config-provider': 2.1.9 - '@smithy/types': 2.8.0 + '@smithy/node-config-provider': 3.1.9 + '@smithy/types': 3.6.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'} + /@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'} + /@smithy/util-middleware@3.0.8: + resolution: {integrity: sha512-p7iYAPaQjoeM+AKABpYWeDdtwQNxasr4aXQEA/OmbOaug9V0odRVDy3Wx4ci8soljE/JXQo+abV0qZpW8NX0yA==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/types': 2.8.0 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/util-retry@2.0.9: - resolution: {integrity: sha512-46BFWe9RqB6g7f4mxm3W3HlqknqQQmWHKlhoqSFZuGNuiDU5KqmpebMbvC3tjTlUkqn4xa2Z7s3Hwb0HNs5scw==} - engines: {node: '>= 14.0.0'} + /@smithy/util-retry@3.0.8: + resolution: {integrity: sha512-TCEhLnY581YJ+g1x0hapPz13JFqzmh/pMWL2KEFASC51qCfw3+Y47MrTmea4bUE5vsdxQ4F6/KFbUeSz22Q1ow==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/service-error-classification': 2.0.9 - '@smithy/types': 2.8.0 + '@smithy/service-error-classification': 3.0.8 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@smithy/util-stream@2.0.24: - resolution: {integrity: sha512-hRpbcRrOxDriMVmbya+Mv77VZVupxRAsfxVDKS54XuiURhdiwCUXJP0X1iJhHinuUf6n8pBF0MkG9C8VooMnWw==} - engines: {node: '>=14.0.0'} + /@smithy/util-stream@3.2.1: + resolution: {integrity: sha512-R3ufuzJRxSJbE58K9AEnL/uSZyVdHzud9wLS8tIbXclxKzoe09CRohj2xV8wpx5tj7ZbiJaKYcutMm1eYgz/0A==} + engines: {node: '>=16.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 + '@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 + '@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'} + /@smithy/util-uri-escape@3.0.0: + resolution: {integrity: sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==} + engines: {node: '>=16.0.0'} dependencies: tslib: 2.6.2 @@ -8511,17 +8553,28 @@ packages: '@smithy/util-buffer-from': 2.0.0 tslib: 2.6.2 - /@smithy/util-waiter@2.0.16: - resolution: {integrity: sha512-5i4YONHQ6HoUWDd+X0frpxTXxSXgJhUFl+z0iMy/zpUmVeCQY2or3Vss6DzHKKMMQL4pmVHpQm9WayHDorFdZg==} - engines: {node: '>=14.0.0'} + /@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@3.1.7: + resolution: {integrity: sha512-d5yGlQtmN/z5eoTtIYgkvOw27US2Ous4VycnXatyoImIF9tzlcpnKqQ/V7qhvJmb2p6xZne1NopCLakdTnkBBQ==} + engines: {node: '>=16.0.0'} dependencies: - '@smithy/abort-controller': 2.0.16 - '@smithy/types': 2.8.0 + '@smithy/abort-controller': 3.1.6 + '@smithy/types': 3.6.0 tslib: 2.6.2 - /@swc/helpers@0.4.11: - resolution: {integrity: sha512-rEUrBSGIoSFuYxwBYtlUFMlE2CwGhmW+w9355/5oduSw8e5h2+Tj4UrAGNNgP9915++wj5vkQo0UuOBqOAq4nw==} + /@swc/counter@0.1.3: + resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==} + + /@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: @@ -9002,6 +9055,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==} @@ -9072,6 +9126,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: @@ -9099,6 +9159,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: @@ -9174,6 +9240,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: @@ -9183,11 +9253,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 @@ -10381,21 +10446,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 @@ -10505,13 +10555,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==} @@ -10805,7 +10848,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==} @@ -10848,13 +10890,15 @@ packages: /caniuse-lite@1.0.30001578: resolution: {integrity: sha512-J/jkFgsQ3NEl4w2lCoM9ZPxrD+FoBNJ7uJUpGVjIg/j0OwJosWM36EPDv+Yyi0V4twBk9pPmlFS+PLykgEvUmg==} + /caniuse-lite@1.0.30001676: + resolution: {integrity: sha512-Qz6zwGCiPghQXGJvgQAem79esjitvJ+CxSbSQkW9H/UX5hg8XM88d4lp2W+MEQ81j+Hip58Il+jGVdazk1z9cw==} + /capital-case@1.0.4: resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==} dependencies: 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==} @@ -10924,7 +10968,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==} @@ -11083,6 +11126,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==} @@ -11319,7 +11365,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==} @@ -11363,12 +11408,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 @@ -11557,14 +11596,8 @@ packages: dependencies: camelize: 1.0.1 css-color-keywords: 1.0.0 - 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 + postcss-value-parser: 4.2.0 + dev: false /css-what@6.1.0: resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==} @@ -11690,19 +11723,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'} @@ -12001,7 +12021,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==} @@ -12085,6 +12104,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: @@ -12350,8 +12384,8 @@ 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==} + /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' @@ -12359,8 +12393,9 @@ packages: typescript: optional: true dependencies: - '@next/eslint-plugin-next': 13.5.6 + '@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 @@ -12990,14 +13025,20 @@ packages: punycode: 1.4.1 dev: true - /fast-xml-parser@4.2.5: - resolution: {integrity: sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==} + /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.3.3: - resolution: {integrity: sha512-coV/D1MhrShMvU6D0I+VAK3umz6hUaxxhL0yp/9RjfiYUfAv14rDhGQL+PLForhMdr0wq3PiV07WtkkNjJjNHg==} + /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 @@ -13240,7 +13281,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==} @@ -13542,6 +13582,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'} @@ -13554,17 +13606,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: @@ -13578,6 +13619,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 @@ -13734,21 +13776,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==} @@ -13852,7 +13896,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==} @@ -14049,6 +14092,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'} @@ -14123,7 +14175,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==} @@ -14149,9 +14200,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'} @@ -14478,9 +14526,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'} @@ -14794,7 +14839,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==} @@ -15710,6 +15754,10 @@ packages: /jose@4.15.4: resolution: {integrity: sha512-W+oqK4H+r5sITxfxpSU+MMdr/YSWGvgZMQDIsNoBDGGy4i7GBPTtvFKibQzW06n3U3TqHjhvBJsirShsEJ6eeQ==} + /jose@5.9.6: + resolution: {integrity: sha512-AMlnetc9+CV9asI19zHmrgS/WYsWUwCn2R7RzlbJWD7F9eWYUTGyBmU9o6PxngtLGOiDGPRu+Uc4fhKzbpteZQ==} + dev: false + /jpeg-js@0.4.4: resolution: {integrity: sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==} @@ -15938,60 +15986,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'} @@ -16339,6 +16333,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 @@ -16435,7 +16433,6 @@ packages: resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==} dependencies: tslib: 2.6.2 - dev: true /lowercase-keys@2.0.0: resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==} @@ -16651,8 +16648,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: @@ -17074,22 +17071,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: @@ -17293,46 +17274,46 @@ 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'} + /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: - 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 + '@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 peerDependenciesMeta: - fibers: + '@opentelemetry/api': optional: true - node-sass: + '@playwright/test': 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) + '@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.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-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 + '@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 @@ -17352,7 +17333,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==} @@ -17509,6 +17489,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'} @@ -17797,7 +17781,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==} @@ -17864,7 +17847,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==} @@ -17912,7 +17894,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==} @@ -17975,7 +17956,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==} @@ -18025,9 +18005,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'} @@ -18197,8 +18174,8 @@ packages: /postcss-value-parser@4.2.0: resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} - /postcss@8.4.14: - resolution: {integrity: sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==} + /postcss@8.4.31: + resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==} engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.7 @@ -18214,6 +18191,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.1 + dev: false + /postgres-array@2.0.0: resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==} engines: {node: '>=4'} @@ -18226,6 +18212,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'} @@ -18301,10 +18291,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'} @@ -18580,6 +18566,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'} @@ -18605,20 +18600,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: @@ -18648,9 +18629,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: @@ -18670,6 +18652,30 @@ packages: tslib: 2.6.2 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: + 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': 18.3.12 + 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==} @@ -18687,18 +18693,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: @@ -18779,6 +18773,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'} @@ -18951,10 +18951,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 @@ -18996,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'} @@ -19274,6 +19284,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'} @@ -19360,7 +19375,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==} @@ -19392,6 +19406,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 @@ -19497,7 +19515,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==} @@ -19594,7 +19611,6 @@ packages: dependencies: dot-case: 3.0.4 tslib: 2.6.2 - dev: true /sockjs@0.3.24: resolution: {integrity: sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==} @@ -19623,6 +19639,11 @@ packages: resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} engines: {node: '>=0.10.0'} + /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==} dependencies: @@ -19969,33 +19990,30 @@ 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'} + /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' - 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) + '@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 - 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 + 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 - supports-color: 5.5.0 - transitivePeerDependencies: - - '@babel/core' + 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==} + /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': '*' @@ -20008,11 +20026,16 @@ packages: optional: true dependencies: '@babel/core': 7.23.7 - react: 17.0.2 + 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 @@ -20513,6 +20536,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==} @@ -20568,10 +20592,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==} @@ -20833,7 +20853,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==} @@ -20843,7 +20862,6 @@ packages: resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==} dependencies: tslib: 2.6.2 - dev: true /uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} @@ -20882,12 +20900,24 @@ packages: dependencies: react: 17.0.2 - /use-sync-external-store@1.2.0(react@17.0.2): - resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==} + /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 + + /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.0.0 || ^18.0.0 + react: ^16.8.0 || ^17 || ^18 dependencies: - react: 17.0.2 + lodash.debounce: 4.0.8 + react: 18.3.1 + dev: false /util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} @@ -21475,7 +21505,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==} @@ -21554,21 +21583,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 a605a42cdbf26bd002040bc6e9ae2dea44021a7f Mon Sep 17 00:00:00 2001 From: Vivid Planet Bot <56380013+vivid-planet-bot@users.noreply.github.com> Date: Thu, 14 Nov 2024 09:21:05 +0100 Subject: [PATCH 010/121] Merge main into next (#122) Co-authored-by: Raphael Blum Co-authored-by: raphaelblum <44967610+raphaelblum@users.noreply.github.com> Co-authored-by: github-actions[bot] Co-authored-by: Johannes Obermair <48853629+johnnyomair@users.noreply.github.com> Co-authored-by: github-actions --- .changeset/short-feet-sing.md | 6 ++++++ demo/api/schema.gql | 1 - packages/admin/CHANGELOG.md | 2 ++ packages/admin/package.json | 2 +- packages/admin/src/targetGroups/TargetGroupsGrid.tsx | 9 --------- packages/api/CHANGELOG.md | 6 ++++++ packages/api/package.json | 5 +++-- packages/api/schema.gql | 1 - .../entity/target-group-entity.factory.ts | 8 ++------ .../api/src/target-group/target-group.resolver.ts | 11 ----------- pnpm-lock.yaml | 8 ++++---- 11 files changed, 24 insertions(+), 35 deletions(-) create mode 100644 .changeset/short-feet-sing.md diff --git a/.changeset/short-feet-sing.md b/.changeset/short-feet-sing.md new file mode 100644 index 00000000..1458d552 --- /dev/null +++ b/.changeset/short-feet-sing.md @@ -0,0 +1,6 @@ +--- +"@comet/brevo-admin": patch +"@comet/brevo-api": patch +--- + +Remove the `totalContactsBlocked` field from the `TargetGroup` type, because it is not delivered in the list request in Brevo anymore. diff --git a/demo/api/schema.gql b/demo/api/schema.gql index a4f94f8b..5a7e6a7a 100644 --- a/demo/api/schema.gql +++ b/demo/api/schema.gql @@ -432,7 +432,6 @@ type TargetGroup implements DocumentInterface { isMainList: Boolean! brevoId: Int! totalSubscribers: Int! - totalContactsBlocked: Int! scope: EmailCampaignContentScope! assignedContactsTargetGroupBrevoId: Int filters: BrevoContactFilterAttributes diff --git a/packages/admin/CHANGELOG.md b/packages/admin/CHANGELOG.md index a10906d0..dcf9d17f 100644 --- a/packages/admin/CHANGELOG.md +++ b/packages/admin/CHANGELOG.md @@ -1,5 +1,7 @@ # @comet/brevo-admin +## 2.1.5 + ## 2.1.4 ## 2.1.3 diff --git a/packages/admin/package.json b/packages/admin/package.json index 09d69af0..62f17fcd 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -1,6 +1,6 @@ { "name": "@comet/brevo-admin", - "version": "2.1.4", + "version": "2.1.5", "repository": { "type": "git", "url": "https://github.com/vivid-planet/comet-brevo-module/", diff --git a/packages/admin/src/targetGroups/TargetGroupsGrid.tsx b/packages/admin/src/targetGroups/TargetGroupsGrid.tsx index da36aef7..a88c449f 100644 --- a/packages/admin/src/targetGroups/TargetGroupsGrid.tsx +++ b/packages/admin/src/targetGroups/TargetGroupsGrid.tsx @@ -49,7 +49,6 @@ const targetGroupsFragment = gql` id title totalSubscribers - totalContactsBlocked isMainList } `; @@ -214,14 +213,6 @@ export function TargetGroupsGrid({ sortable: false, width: 200, }, - { - field: "totalContactsBlocked", - headerName: intl.formatMessage({ id: "cometBrevoModule.targetGroup.totalContactsBlocked", defaultMessage: "Total contacts blocked" }), - type: "number", - filterable: false, - sortable: false, - width: 200, - }, { field: "actions", headerName: "", diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md index fc0d13db..0033f146 100644 --- a/packages/api/CHANGELOG.md +++ b/packages/api/CHANGELOG.md @@ -1,5 +1,11 @@ # @comet/brevo-api +## 2.1.5 + +### Patch Changes + +- 54b8858: Add `@nestjs/core` as a peer dependency. It should have been included as a peer dependency from the beginning. + ## 2.1.4 ### Patch Changes diff --git a/packages/api/package.json b/packages/api/package.json index cca1acfa..f10a722e 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@comet/brevo-api", - "version": "2.1.4", + "version": "2.1.5", "repository": { "type": "git", "url": "https://github.com/vivid-planet/comet-brevo-module/", @@ -30,7 +30,6 @@ "@getbrevo/brevo": "^2.2.0", "@nestjs/axios": "^1.0.0", "@nestjs/cache-manager": "^2.2.2", - "@types/multer": "^1.4.11", "cache-manager": "^5.7.3", "commander": "^7.2.0", "node-fetch": "^2.6.1" @@ -52,6 +51,7 @@ "@types/jest": "^29.5.0", "@types/lodash.isequal": "^4.0.0", "@types/mime-db": "^1.43.5", + "@types/multer": "^1.4.11", "@types/node-fetch": "^2.5.12", "@types/rimraf": "^3.0.0", "@types/uuid": "^8.3.0", @@ -83,6 +83,7 @@ "@mikro-orm/nestjs": "^5.2.3", "@mikro-orm/postgresql": "^5.9.8", "@nestjs/common": "^9.0.0", + "@nestjs/core": "^9.0.0", "@nestjs/platform-express": "^9.0.0", "reflect-metadata": "^0.1.13", "rxjs": "^7.0.0" diff --git a/packages/api/schema.gql b/packages/api/schema.gql index 056e9f26..b3c01c02 100644 --- a/packages/api/schema.gql +++ b/packages/api/schema.gql @@ -119,7 +119,6 @@ type TargetGroup implements DocumentInterface { isMainList: Boolean! brevoId: Int! totalSubscribers: Int! - totalContactsBlocked: Int! scope: EmailCampaignContentScope! assignedContactsTargetGroupBrevoId: Int } diff --git a/packages/api/src/target-group/entity/target-group-entity.factory.ts b/packages/api/src/target-group/entity/target-group-entity.factory.ts index ff94c6f1..533f60d7 100644 --- a/packages/api/src/target-group/entity/target-group-entity.factory.ts +++ b/packages/api/src/target-group/entity/target-group-entity.factory.ts @@ -8,7 +8,7 @@ import { EmailCampaignInterface } from "../../email-campaign/entities/email-camp import { BrevoContactFilterAttributesInterface, EmailCampaignScopeInterface } from "../../types"; export interface TargetGroupInterface { - [OptionalProps]?: "createdAt" | "updatedAt" | "totalSubscribers" | "totalContactsBlocked"; + [OptionalProps]?: "createdAt" | "updatedAt" | "totalSubscribers"; id: string; createdAt: Date; updatedAt: Date; @@ -16,7 +16,6 @@ export interface TargetGroupInterface { isMainList: boolean; brevoId: number; totalSubscribers: number; - totalContactsBlocked: number; scope: EmailCampaignScopeInterface; filters?: BrevoContactFilterAttributesInterface; assignedContactsTargetGroupBrevoId?: number; @@ -37,7 +36,7 @@ export class TargetGroupEntityFactory { isAbstract: true, }) class TargetGroupBase implements TargetGroupInterface, DocumentInterface { - [OptionalProps]?: "createdAt" | "updatedAt" | "totalSubscribers" | "totalContactsBlocked"; + [OptionalProps]?: "createdAt" | "updatedAt" | "totalSubscribers"; @PrimaryKey({ columnType: "uuid" }) @Field(() => ID) @@ -66,9 +65,6 @@ export class TargetGroupEntityFactory { @Field(() => Int) totalSubscribers: number; - @Field(() => Int) - totalContactsBlocked: number; - @Embedded(() => Scope) @Field(() => Scope) scope: typeof Scope; diff --git a/packages/api/src/target-group/target-group.resolver.ts b/packages/api/src/target-group/target-group.resolver.ts index a4bc82bb..d8965457 100644 --- a/packages/api/src/target-group/target-group.resolver.ts +++ b/packages/api/src/target-group/target-group.resolver.ts @@ -75,8 +75,6 @@ export function createTargetGroupsResolver({ if (brevoContactList) { contactList.totalSubscribers = brevoContactList.uniqueSubscribers; - // TODO: brevo is returning a wrong value for totalBlacklisted - // contactList.totalContactsBlocked = brevoContactList.totalBlacklisted; } } @@ -231,15 +229,6 @@ export function createTargetGroupsResolver({ return uniqueSubscribers; } - - @ResolveField() - async totalContactsBlocked(@Parent() targetGroup: TargetGroupInterface): Promise { - if (targetGroup.totalContactsBlocked !== undefined) return targetGroup.totalContactsBlocked; - - const { totalBlacklisted } = await this.brevoApiContactsService.findBrevoContactListById(targetGroup.brevoId, targetGroup.scope); - - return totalBlacklisted; - } } return TargetGroupResolver; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 68f6d5ca..9a97857d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -930,9 +930,6 @@ importers: '@nestjs/cache-manager': specifier: ^2.2.2 version: 2.2.2(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(cache-manager@5.7.3)(rxjs@7.8.1) - '@types/multer': - specifier: ^1.4.11 - version: 1.4.11 cache-manager: specifier: ^5.7.3 version: 5.7.3 @@ -991,6 +988,9 @@ importers: '@types/mime-db': specifier: ^1.43.5 version: 1.43.5 + '@types/multer': + specifier: ^1.4.11 + version: 1.4.11 '@types/node-fetch': specifier: ^2.5.12 version: 2.6.11 @@ -9042,7 +9042,7 @@ packages: resolution: {integrity: sha512-svK240gr6LVWvv3YGyhLlA+6LRRWA4mnGIU7RcNmgjBYFl6665wcXrRfxGp5tEPVHUNm5FMcmq7too9bxCwX/w==} dependencies: '@types/express': 4.17.21 - dev: false + dev: true /@types/mysql@2.15.22: resolution: {integrity: sha512-wK1pzsJVVAjYCSZWQoWHziQZbNggXFDUEIGf54g4ZM/ERuP86uGdWeKZWMYlqTPMZfHJJvLPyogXGvCOg87yLQ==} From 7fc5b6c422a0106827f4a74276bbe43c4225c3ca Mon Sep 17 00:00:00 2001 From: Raphael Blum Date: Fri, 15 Nov 2024 08:02:33 +0100 Subject: [PATCH 011/121] fix merge conflicts --- package.json | 2 +- packages/admin/CHANGELOG.md | 3 --- packages/admin/package.json | 4 ---- packages/api/CHANGELOG.md | 3 --- packages/api/package.json | 4 ---- 5 files changed, 1 insertion(+), 15 deletions(-) diff --git a/package.json b/package.json index 7bab62e8..42974c27 100644 --- a/package.json +++ b/package.json @@ -68,4 +68,4 @@ } } } -} \ No newline at end of file +} diff --git a/packages/admin/CHANGELOG.md b/packages/admin/CHANGELOG.md index 84cfb5fa..7305ca34 100644 --- a/packages/admin/CHANGELOG.md +++ b/packages/admin/CHANGELOG.md @@ -1,14 +1,11 @@ # @comet/brevo-admin -<<<<<<< HEAD -======= ## 2.1.6 ### Patch Changes - be6d19b: Remove the `totalContactsBlocked` field from the `TargetGroup` type, because it is not delivered in the list request in Brevo anymore. ->>>>>>> main ## 2.1.5 ## 2.1.4 diff --git a/packages/admin/package.json b/packages/admin/package.json index befa5bba..a4f622bc 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -1,10 +1,6 @@ { "name": "@comet/brevo-admin", -<<<<<<< HEAD - "version": "2.1.5", -======= "version": "2.1.6", ->>>>>>> main "repository": { "type": "git", "url": "https://github.com/vivid-planet/comet-brevo-module/", diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md index 5269d941..77463fa9 100644 --- a/packages/api/CHANGELOG.md +++ b/packages/api/CHANGELOG.md @@ -1,14 +1,11 @@ # @comet/brevo-api -<<<<<<< HEAD -======= ## 2.1.6 ### Patch Changes - be6d19b: Remove the `totalContactsBlocked` field from the `TargetGroup` type, because it is not delivered in the list request in Brevo anymore. ->>>>>>> main ## 2.1.5 ### Patch Changes diff --git a/packages/api/package.json b/packages/api/package.json index 84dff6ca..7bdca748 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,10 +1,6 @@ { "name": "@comet/brevo-api", -<<<<<<< HEAD - "version": "2.1.5", -======= "version": "2.1.6", ->>>>>>> main "repository": { "type": "git", "url": "https://github.com/vivid-planet/comet-brevo-module/", From 8b252ea0993c5d7c1f14a34fc0a6e6e347b28b47 Mon Sep 17 00:00:00 2001 From: raphaelblum <44967610+raphaelblum@users.noreply.github.com> Date: Fri, 15 Nov 2024 08:15:45 +0100 Subject: [PATCH 012/121] Remove unnecessary axios dependency (#139) --- packages/admin/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/admin/package.json b/packages/admin/package.json index a4f622bc..8014a388 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -86,7 +86,6 @@ "@mui/material": "^5.8.6", "@mui/system": "^5.8.6", "@mui/x-data-grid": "^5.17.26", - "axios": "^0.21.0", "draft-js": "^0.11.0", "final-form": "^4.16.1", "graphql": "^15.4.0", From 06102c848ebfc07867118f2f3ae0c6423c6c938d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 08:17:31 +0100 Subject: [PATCH 013/121] Update dependency express to v4.20.0 [SECURITY] (#129) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- pnpm-lock.yaml | 457 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 315 insertions(+), 142 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9a97857d..016f7b0c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -283,7 +283,7 @@ importers: version: link:../../packages/api '@comet/cms-api': 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) + 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.20.0)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) '@faker-js/faker': specifier: ^8.3.1 version: 8.3.1 @@ -346,7 +346,7 @@ importers: version: 3.13.0(graphql@15.8.0) apollo-server-express: specifier: ^3.3.0 - version: 3.13.0(express@4.18.2)(graphql@15.8.0) + version: 3.13.0(express@4.20.0)(graphql@15.8.0) async: specifier: ^3.2.0 version: 3.2.5 @@ -373,7 +373,7 @@ importers: version: 6.3.0 express: specifier: ^4.18.2 - version: 4.18.2 + version: 4.20.0 file-type: specifier: ^16.0.0 version: 16.5.4 @@ -518,7 +518,7 @@ importers: version: 0.11.7(react-dom@18.3.1)(react@18.3.1) express: specifier: ^4.0.0 - version: 4.18.2 + version: 4.20.0 fs-extra: specifier: ^9.0.0 version: 9.1.0 @@ -669,7 +669,7 @@ importers: version: 0.11.7(react-dom@18.3.1)(react@18.3.1) express: specifier: ^4.0.0 - version: 4.18.2 + version: 4.20.0 fs-extra: specifier: ^9.0.0 version: 9.1.0 @@ -945,7 +945,7 @@ importers: version: 7.5.0(@nestjs/common@9.4.3) '@comet/cms-api': 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) + 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.20.0)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) '@comet/eslint-config': 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) @@ -1014,7 +1014,7 @@ importers: version: 8.56.0 express: specifier: ^4.17.1 - version: 4.18.2 + version: 4.20.0 graphql: specifier: ^15.5.0 version: 15.8.0 @@ -2115,7 +2115,7 @@ packages: slash: 2.0.0 optionalDependencies: '@nicolo-ribaudo/chokidar-2': 2.1.8-no-fsevents.3 - chokidar: 3.5.3 + chokidar: 3.6.0 dev: true /@babel/code-frame@7.23.5: @@ -2222,7 +2222,7 @@ packages: '@babel/core': 7.23.7 '@babel/helper-compilation-targets': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 lodash.debounce: 4.0.8 resolve: 1.22.8 transitivePeerDependencies: @@ -4068,7 +4068,7 @@ packages: - draft-js - history - /@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): + /@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.20.0)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1): resolution: {integrity: sha512-jol/BP9b98QXR8BuiIdxKKR2Cj5rHvDvV31Fo3d0N3hrUO03IQ5BW/dkAzCQtKLbv6DX9NRjWQ+CtfDOFb/Gcw==} hasBin: true peerDependencies: @@ -4120,7 +4120,7 @@ packages: dataloader: 2.2.2 date-fns: 2.30.0 exifr: 7.1.3 - express: 4.18.2 + express: 4.20.0 fast-xml-parser: 4.3.3 file-type: 16.5.4 get-image-colors: 4.0.1 @@ -4796,7 +4796,7 @@ packages: engines: {node: '>=14.2.0'} dependencies: form-data: 4.0.0 - qs: 6.11.2 + qs: 6.13.0 xcase: 2.0.1 dev: true @@ -5349,7 +5349,7 @@ packages: '@types/json-stable-stringify': 1.0.36 '@whatwg-node/fetch': 0.8.8 chalk: 4.1.2 - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 dotenv: 16.3.1 graphql: 15.8.0 graphql-request: 6.1.0(graphql@15.8.0) @@ -6109,7 +6109,7 @@ packages: underscore: 1.13.6 ws: 8.16.0 optionalDependencies: - openid-client: 5.6.4 + openid-client: 5.7.0 transitivePeerDependencies: - bufferutil - utf-8-validate @@ -6612,7 +6612,7 @@ packages: '@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) apollo-server-core: 3.13.0(graphql@15.8.0) - apollo-server-express: 3.13.0(express@4.18.2)(graphql@15.8.0) + apollo-server-express: 3.13.0(express@4.20.0)(graphql@15.8.0) graphql: 15.8.0 iterall: 1.3.0 lodash.omit: 4.5.0 @@ -9408,7 +9408,7 @@ packages: dependencies: '@typescript-eslint/types': 6.19.0 '@typescript-eslint/visitor-keys': 6.19.0 - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 globby: 11.1.0 is-glob: 4.0.3 minimatch: 9.0.3 @@ -9829,7 +9829,7 @@ packages: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} dependencies: - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 transitivePeerDependencies: - supports-color dev: true @@ -9838,7 +9838,7 @@ packages: resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==} engines: {node: '>= 14'} dependencies: - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 transitivePeerDependencies: - supports-color @@ -10015,7 +10015,7 @@ packages: graphql: 15.8.0 dev: false - /apollo-server-express@3.13.0(express@4.18.2)(graphql@15.8.0): + /apollo-server-express@3.13.0(express@4.20.0)(graphql@15.8.0): resolution: {integrity: sha512-iSxICNbDUyebOuM8EKb3xOrpIwOQgKxGbR2diSr4HP3IW8T3njKFOoMce50vr+moOCe1ev8BnLcw9SNbuUtf7g==} engines: {node: '>=12.0'} peerDependencies: @@ -10032,7 +10032,7 @@ packages: apollo-server-types: 3.8.0(graphql@15.8.0) body-parser: 1.20.2 cors: 2.8.5 - express: 4.18.2 + express: 4.20.0 graphql: 15.8.0 parseurl: 1.3.3 transitivePeerDependencies: @@ -10123,7 +10123,7 @@ packages: /array-buffer-byte-length@1.0.0: resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 is-array-buffer: 3.0.2 dev: true @@ -10139,10 +10139,10 @@ packages: resolution: {integrity: sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.4 is-string: 1.0.7 dev: true @@ -10154,18 +10154,18 @@ packages: resolution: {integrity: sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 es-shim-unscopables: 1.0.2 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.4 dev: true /array.prototype.flat@1.3.2: resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 es-shim-unscopables: 1.0.2 @@ -10175,7 +10175,7 @@ packages: resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 es-shim-unscopables: 1.0.2 @@ -10184,11 +10184,11 @@ packages: /array.prototype.tosorted@1.1.2: resolution: {integrity: sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg==} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 es-shim-unscopables: 1.0.2 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.4 dev: true /arraybuffer.prototype.slice@1.0.2: @@ -10196,10 +10196,10 @@ packages: engines: {node: '>= 0.4'} dependencies: array-buffer-byte-length: 1.0.0 - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.4 is-array-buffer: 3.0.2 is-shared-array-buffer: 1.0.2 dev: true @@ -10672,6 +10672,25 @@ packages: transitivePeerDependencies: - supports-color + /body-parser@1.20.3: + resolution: {integrity: sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==} + engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} + dependencies: + bytes: 3.1.2 + content-type: 1.0.5 + debug: 2.6.9 + depd: 2.0.0 + destroy: 1.2.0 + http-errors: 2.0.0 + iconv-lite: 0.4.24 + on-finished: 2.4.1 + qs: 6.13.0 + raw-body: 2.5.2 + type-is: 1.6.18 + unpipe: 1.0.0 + transitivePeerDependencies: + - supports-color + /bonjour-service@1.2.1: resolution: {integrity: sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==} dependencies: @@ -10829,8 +10848,19 @@ packages: resolution: {integrity: sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==} dependencies: function-bind: 1.1.2 - get-intrinsic: 1.2.2 - set-function-length: 1.2.0 + get-intrinsic: 1.2.4 + set-function-length: 1.2.2 + dev: true + + /call-bind@1.0.7: + resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==} + engines: {node: '>= 0.4'} + dependencies: + es-define-property: 1.0.0 + es-errors: 1.3.0 + function-bind: 1.1.2 + get-intrinsic: 1.2.4 + set-function-length: 1.2.2 /callsites@3.1.0: resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} @@ -11029,6 +11059,23 @@ packages: optionalDependencies: fsevents: 2.3.3 + /chokidar@3.6.0: + resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} + engines: {node: '>= 8.10.0'} + requiresBuild: true + dependencies: + anymatch: 3.1.3 + braces: 3.0.2 + glob-parent: 5.1.2 + is-binary-path: 2.1.0 + is-glob: 4.0.3 + normalize-path: 3.0.0 + readdirp: 3.6.0 + optionalDependencies: + fsevents: 2.3.3 + dev: true + optional: true + /chownr@2.0.0: resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} engines: {node: '>=10'} @@ -11314,7 +11361,7 @@ packages: resolution: {integrity: sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==} engines: {node: '>= 0.6'} dependencies: - mime-db: 1.52.0 + mime-db: 1.53.0 /compression@1.7.4: resolution: {integrity: sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==} @@ -11402,6 +11449,10 @@ packages: resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==} engines: {node: '>= 0.6'} + /cookie@0.6.0: + resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==} + engines: {node: '>= 0.6'} + /core-js-compat@3.35.0: resolution: {integrity: sha512-5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw==} dependencies: @@ -11735,6 +11786,17 @@ packages: ms: 2.1.2 supports-color: 9.4.0 + /debug@4.3.7: + resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.1.3 + /decamelize-keys@1.1.1: resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==} engines: {node: '>=0.10.0'} @@ -11821,13 +11883,13 @@ packages: resolution: {integrity: sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==} engines: {node: '>=10'} - /define-data-property@1.1.1: - resolution: {integrity: sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==} + /define-data-property@1.1.4: + resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==} engines: {node: '>= 0.4'} dependencies: - get-intrinsic: 1.2.2 + es-define-property: 1.0.0 + es-errors: 1.3.0 gopd: 1.0.1 - has-property-descriptors: 1.0.1 /define-lazy-prop@2.0.0: resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==} @@ -11842,8 +11904,8 @@ packages: resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==} engines: {node: '>= 0.4'} dependencies: - define-data-property: 1.1.1 - has-property-descriptors: 1.0.1 + define-data-property: 1.1.4 + has-property-descriptors: 1.0.2 object-keys: 1.1.1 /delay@5.0.0: @@ -12203,6 +12265,10 @@ packages: resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} engines: {node: '>= 0.8'} + /encodeurl@2.0.0: + resolution: {integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==} + engines: {node: '>= 0.8'} + /end-of-stream@1.4.4: resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==} dependencies: @@ -12263,18 +12329,18 @@ packages: array-buffer-byte-length: 1.0.0 arraybuffer.prototype.slice: 1.0.2 available-typed-arrays: 1.0.5 - call-bind: 1.0.5 + call-bind: 1.0.7 es-set-tostringtag: 2.0.2 es-to-primitive: 1.2.1 function.prototype.name: 1.1.6 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.4 get-symbol-description: 1.0.0 globalthis: 1.0.3 gopd: 1.0.1 - has-property-descriptors: 1.0.1 - has-proto: 1.0.1 + has-property-descriptors: 1.0.2 + has-proto: 1.0.3 has-symbols: 1.0.3 - hasown: 2.0.0 + hasown: 2.0.2 internal-slot: 1.0.6 is-array-buffer: 3.0.2 is-callable: 1.2.7 @@ -12284,7 +12350,7 @@ packages: is-string: 1.0.7 is-typed-array: 1.1.12 is-weakref: 1.0.2 - object-inspect: 1.13.1 + object-inspect: 1.13.3 object-keys: 1.1.1 object.assign: 4.1.5 regexp.prototype.flags: 1.5.1 @@ -12301,19 +12367,29 @@ packages: which-typed-array: 1.1.13 dev: true + /es-define-property@1.0.0: + resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==} + engines: {node: '>= 0.4'} + dependencies: + get-intrinsic: 1.2.4 + + /es-errors@1.3.0: + resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} + engines: {node: '>= 0.4'} + /es-iterator-helpers@1.0.15: resolution: {integrity: sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g==} dependencies: asynciterator.prototype: 1.0.0 - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 es-set-tostringtag: 2.0.2 function-bind: 1.1.2 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.4 globalthis: 1.0.3 - has-property-descriptors: 1.0.1 - has-proto: 1.0.1 + has-property-descriptors: 1.0.2 + has-proto: 1.0.3 has-symbols: 1.0.3 internal-slot: 1.0.6 iterator.prototype: 1.1.2 @@ -12327,9 +12403,9 @@ packages: resolution: {integrity: sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==} engines: {node: '>= 0.4'} dependencies: - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.4 has-tostringtag: 1.0.0 - hasown: 2.0.0 + hasown: 2.0.2 dev: true /es-shim-unscopables@1.0.2: @@ -12592,7 +12668,7 @@ packages: emoji-regex: 9.2.2 es-iterator-helpers: 1.0.15 eslint: 8.56.0 - hasown: 2.0.0 + hasown: 2.0.2 jsx-ast-utils: 3.3.5 language-tags: 1.0.9 minimatch: 3.1.2 @@ -12936,6 +13012,44 @@ packages: transitivePeerDependencies: - supports-color + /express@4.20.0: + resolution: {integrity: sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==} + engines: {node: '>= 0.10.0'} + dependencies: + accepts: 1.3.8 + array-flatten: 1.1.1 + body-parser: 1.20.3 + content-disposition: 0.5.4 + content-type: 1.0.5 + cookie: 0.6.0 + cookie-signature: 1.0.6 + debug: 2.6.9 + depd: 2.0.0 + encodeurl: 2.0.0 + escape-html: 1.0.3 + etag: 1.8.1 + finalhandler: 1.2.0 + fresh: 0.5.2 + http-errors: 2.0.0 + merge-descriptors: 1.0.3 + methods: 1.1.2 + on-finished: 2.4.1 + parseurl: 1.3.3 + path-to-regexp: 0.1.10 + proxy-addr: 2.0.7 + qs: 6.11.0 + range-parser: 1.2.1 + safe-buffer: 5.2.1 + send: 0.19.0 + serve-static: 1.16.0 + setprototypeof: 1.2.0 + statuses: 2.0.1 + type-is: 1.6.18 + utils-merge: 1.0.1 + vary: 1.1.2 + transitivePeerDependencies: + - supports-color + /extend@3.0.2: resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==} @@ -13434,7 +13548,7 @@ packages: resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 functions-have-names: 1.2.3 @@ -13485,13 +13599,15 @@ packages: get-svg-colors: 2.0.1 pify: 5.0.0 - /get-intrinsic@1.2.2: - resolution: {integrity: sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==} + /get-intrinsic@1.2.4: + resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==} + engines: {node: '>= 0.4'} dependencies: + es-errors: 1.3.0 function-bind: 1.1.2 - has-proto: 1.0.1 + has-proto: 1.0.3 has-symbols: 1.0.3 - hasown: 2.0.0 + hasown: 2.0.2 /get-package-type@0.1.0: resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==} @@ -13545,8 +13661,8 @@ packages: resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 - get-intrinsic: 1.2.2 + call-bind: 1.0.7 + get-intrinsic: 1.2.4 dev: true /get-tsconfig@4.7.2: @@ -13682,7 +13798,7 @@ packages: /gopd@1.0.1: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} dependencies: - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.4 /got@11.8.6: resolution: {integrity: sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==} @@ -13745,7 +13861,7 @@ packages: peerDependencies: graphql: '>=0.9 <0.14 || ^14.0.2 || ^15.4.0 || ^16.3.0' dependencies: - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 graphql: 15.8.0 tslib: 2.6.2 transitivePeerDependencies: @@ -13854,13 +13970,13 @@ packages: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} engines: {node: '>=8'} - /has-property-descriptors@1.0.1: - resolution: {integrity: sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==} + /has-property-descriptors@1.0.2: + resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==} dependencies: - get-intrinsic: 1.2.2 + es-define-property: 1.0.0 - /has-proto@1.0.1: - resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==} + /has-proto@1.0.3: + resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==} engines: {node: '>= 0.4'} /has-symbols@1.0.3: @@ -13886,6 +14002,13 @@ packages: engines: {node: '>= 0.4'} dependencies: function-bind: 1.1.2 + dev: true + + /hasown@2.0.2: + resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} + engines: {node: '>= 0.4'} + dependencies: + function-bind: 1.1.2 /he@1.2.0: resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==} @@ -14077,7 +14200,7 @@ packages: dependencies: '@tootallnate/once': 1.1.2 agent-base: 6.0.2 - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 transitivePeerDependencies: - supports-color dev: true @@ -14087,7 +14210,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.0 - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 transitivePeerDependencies: - supports-color dev: true @@ -14097,7 +14220,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.0 - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 transitivePeerDependencies: - supports-color @@ -14152,7 +14275,7 @@ packages: engines: {node: '>= 6'} dependencies: agent-base: 6.0.2 - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 transitivePeerDependencies: - supports-color dev: true @@ -14162,7 +14285,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.0 - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 transitivePeerDependencies: - supports-color dev: true @@ -14172,7 +14295,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.0 - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 transitivePeerDependencies: - supports-color @@ -14355,9 +14478,9 @@ packages: resolution: {integrity: sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==} engines: {node: '>= 0.4'} dependencies: - get-intrinsic: 1.2.2 - hasown: 2.0.0 - side-channel: 1.0.4 + get-intrinsic: 1.2.4 + hasown: 2.0.2 + side-channel: 1.0.6 dev: true /interpret@1.4.0: @@ -14413,8 +14536,8 @@ packages: /is-array-buffer@3.0.2: resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==} dependencies: - call-bind: 1.0.5 - get-intrinsic: 1.2.2 + call-bind: 1.0.7 + get-intrinsic: 1.2.4 is-typed-array: 1.1.12 dev: true @@ -14449,7 +14572,7 @@ packages: resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 has-tostringtag: 1.0.0 dev: true @@ -14464,7 +14587,7 @@ packages: /is-core-module@2.13.1: resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==} dependencies: - hasown: 2.0.0 + hasown: 2.0.2 /is-date-object@1.0.5: resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==} @@ -14491,7 +14614,7 @@ packages: /is-finalizationregistry@1.0.2: resolution: {integrity: sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 dev: true /is-fullwidth-code-point@2.0.0: @@ -14555,7 +14678,7 @@ packages: resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 /is-negative-zero@2.0.2: @@ -14609,7 +14732,7 @@ packages: resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 has-tostringtag: 1.0.0 dev: true @@ -14627,7 +14750,7 @@ packages: /is-shared-array-buffer@1.0.2: resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 dev: true /is-stream@2.0.1: @@ -14700,14 +14823,14 @@ packages: /is-weakref@1.0.2: resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 dev: true /is-weakset@2.0.2: resolution: {integrity: sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==} dependencies: - call-bind: 1.0.5 - get-intrinsic: 1.2.2 + call-bind: 1.0.7 + get-intrinsic: 1.2.4 dev: true /is-windows@1.0.2: @@ -14800,7 +14923,7 @@ packages: resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==} engines: {node: '>=10'} dependencies: - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 istanbul-lib-coverage: 3.2.2 source-map: 0.6.1 transitivePeerDependencies: @@ -14826,7 +14949,7 @@ packages: resolution: {integrity: sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==} dependencies: define-properties: 1.2.1 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.4 has-symbols: 1.0.3 reflect.getprototypeof: 1.0.4 set-function-name: 2.0.1 @@ -15754,6 +15877,11 @@ packages: /jose@4.15.4: resolution: {integrity: sha512-W+oqK4H+r5sITxfxpSU+MMdr/YSWGvgZMQDIsNoBDGGy4i7GBPTtvFKibQzW06n3U3TqHjhvBJsirShsEJ6eeQ==} + /jose@4.15.9: + resolution: {integrity: sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==} + requiresBuild: true + optional: true + /jose@5.9.6: resolution: {integrity: sha512-AMlnetc9+CV9asI19zHmrgS/WYsWUwCn2R7RzlbJWD7F9eWYUTGyBmU9o6PxngtLGOiDGPRu+Uc4fhKzbpteZQ==} dev: false @@ -16031,7 +16159,7 @@ packages: dependencies: '@types/express': 4.17.21 '@types/jsonwebtoken': 9.0.5 - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 jose: 4.15.4 limiter: 1.1.5 lru-memoizer: 2.2.0 @@ -16656,6 +16784,10 @@ packages: resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} engines: {node: '>= 0.6'} + /mime-db@1.53.0: + resolution: {integrity: sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==} + engines: {node: '>= 0.6'} + /mime-types@2.1.35: resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==} engines: {node: '>= 0.6'} @@ -17484,6 +17616,11 @@ packages: /object-inspect@1.13.1: resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==} + dev: true + + /object-inspect@1.13.3: + resolution: {integrity: sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==} + engines: {node: '>= 0.4'} /object-keys@1.1.1: resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} @@ -17497,7 +17634,7 @@ packages: resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 has-symbols: 1.0.3 object-keys: 1.1.1 @@ -17507,7 +17644,7 @@ packages: resolution: {integrity: sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 dev: true @@ -17516,7 +17653,7 @@ packages: resolution: {integrity: sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 dev: true @@ -17524,10 +17661,10 @@ packages: /object.groupby@1.0.1: resolution: {integrity: sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.4 dev: true /object.hasown@1.1.3: @@ -17541,7 +17678,7 @@ packages: resolution: {integrity: sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 dev: true @@ -17621,11 +17758,11 @@ packages: hasBin: true dev: false - /openid-client@5.6.4: - resolution: {integrity: sha512-T1h3B10BRPKfcObdBklX639tVz+xh34O7GjofqrqiAQdm7eHsQ00ih18x6wuJ/E6FxdtS2u3FmUGPDeEcMwzNA==} + /openid-client@5.7.0: + resolution: {integrity: sha512-4GCCGZt1i2kTHpwvaC/sCpTpQqDnBzDzuJcJMbH+y1Q5qI8U8RBvoSh28svarXszZHR5BAMXbJPX1PGPRE3VOA==} requiresBuild: true dependencies: - jose: 4.15.4 + jose: 4.15.9 lru-cache: 6.0.0 object-hash: 2.2.0 oidc-token-hash: 5.0.3 @@ -17957,6 +18094,9 @@ packages: lru-cache: 10.2.2 minipass: 7.0.4 + /path-to-regexp@0.1.10: + resolution: {integrity: sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==} + /path-to-regexp@0.1.7: resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==} @@ -18405,14 +18545,13 @@ packages: resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} engines: {node: '>=0.6'} dependencies: - side-channel: 1.0.4 + side-channel: 1.0.6 - /qs@6.11.2: - resolution: {integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==} + /qs@6.13.0: + resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==} engines: {node: '>=0.6'} dependencies: - side-channel: 1.0.4 - dev: true + side-channel: 1.0.6 /qs@6.5.3: resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==} @@ -18932,10 +19071,10 @@ packages: resolution: {integrity: sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.4 globalthis: 1.0.3 which-builtin-type: 1.1.3 dev: true @@ -18968,7 +19107,7 @@ packages: resolution: {integrity: sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 set-function-name: 2.0.1 dev: true @@ -19082,7 +19221,7 @@ packages: resolution: {integrity: sha512-3TLx5TGyAY6AOqLBoXmHkNql0HIf2RGbuMgCDT2WO/uGVAPJs6h7Kl+bN6TIZGd9bWhWPwnDnTHGtW8Iu77sdw==} engines: {node: '>=8.6.0'} dependencies: - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 module-details-from-path: 1.0.3 resolve: 1.22.8 transitivePeerDependencies: @@ -19245,8 +19384,8 @@ packages: resolution: {integrity: sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==} engines: {node: '>=0.4'} dependencies: - call-bind: 1.0.5 - get-intrinsic: 1.2.2 + call-bind: 1.0.7 + get-intrinsic: 1.2.4 has-symbols: 1.0.3 isarray: 2.0.5 dev: true @@ -19261,8 +19400,8 @@ packages: resolution: {integrity: sha512-83S9w6eFq12BBIJYvjMux6/dkirb8+4zJRA9cxNBVb7Wq5fJBW+Xze48WqR8pxua7bDuAaaAxtVVd4Idjp1dBQ==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 - get-intrinsic: 1.2.2 + call-bind: 1.0.7 + get-intrinsic: 1.2.4 is-regex: 1.1.4 dev: true @@ -19369,6 +19508,26 @@ packages: transitivePeerDependencies: - supports-color + /send@0.19.0: + resolution: {integrity: sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==} + engines: {node: '>= 0.8.0'} + dependencies: + debug: 2.6.9 + depd: 2.0.0 + destroy: 1.2.0 + encodeurl: 1.0.2 + escape-html: 1.0.3 + etag: 1.8.1 + fresh: 0.5.2 + http-errors: 2.0.0 + mime: 1.6.0 + ms: 2.1.3 + on-finished: 2.4.1 + range-parser: 1.2.1 + statuses: 2.0.1 + transitivePeerDependencies: + - supports-color + /sentence-case@3.0.4: resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==} dependencies: @@ -19406,6 +19565,17 @@ packages: transitivePeerDependencies: - supports-color + /serve-static@1.16.0: + resolution: {integrity: sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==} + engines: {node: '>= 0.8.0'} + dependencies: + encodeurl: 1.0.2 + escape-html: 1.0.3 + parseurl: 1.3.3 + send: 0.18.0 + transitivePeerDependencies: + - supports-color + /server-only@0.0.1: resolution: {integrity: sha512-qepMx2JxAa5jjfzxG79yPPq+8BuFToHd1hm7kI+Z4zAq1ftQiP7HcxMhDDItrbtwVeLg/cY2JnKnrcFkmiswNA==} dev: false @@ -19414,23 +19584,24 @@ packages: resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} dev: true - /set-function-length@1.2.0: - resolution: {integrity: sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w==} + /set-function-length@1.2.2: + resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} engines: {node: '>= 0.4'} dependencies: - define-data-property: 1.1.1 + define-data-property: 1.1.4 + es-errors: 1.3.0 function-bind: 1.1.2 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.4 gopd: 1.0.1 - has-property-descriptors: 1.0.1 + has-property-descriptors: 1.0.2 /set-function-name@2.0.1: resolution: {integrity: sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==} engines: {node: '>= 0.4'} dependencies: - define-data-property: 1.1.1 + define-data-property: 1.1.4 functions-have-names: 1.2.3 - has-property-descriptors: 1.0.1 + has-property-descriptors: 1.0.2 dev: true /setimmediate@1.0.5: @@ -19502,12 +19673,14 @@ packages: resolution: {integrity: sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==} dev: false - /side-channel@1.0.4: - resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==} + /side-channel@1.0.6: + resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==} + engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 - get-intrinsic: 1.2.2 - object-inspect: 1.13.1 + call-bind: 1.0.7 + es-errors: 1.3.0 + get-intrinsic: 1.2.4 + object-inspect: 1.13.3 /signal-exit@3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} @@ -19702,7 +19875,7 @@ packages: /spdy-transport@3.0.0: resolution: {integrity: sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==} dependencies: - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 detect-node: 2.1.0 hpack.js: 2.1.6 obuf: 1.1.2 @@ -19715,7 +19888,7 @@ packages: resolution: {integrity: sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==} engines: {node: '>=6.0.0'} dependencies: - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 handle-thing: 2.0.1 http-deceiver: 1.2.7 select-hose: 2.0.0 @@ -19850,22 +20023,22 @@ packages: /string.prototype.matchall@4.0.10: resolution: {integrity: sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 - get-intrinsic: 1.2.2 + get-intrinsic: 1.2.4 has-symbols: 1.0.3 internal-slot: 1.0.6 regexp.prototype.flags: 1.5.1 set-function-name: 2.0.1 - side-channel: 1.0.4 + side-channel: 1.0.6 dev: true /string.prototype.padend@3.1.5: resolution: {integrity: sha512-DOB27b/2UTTD+4myKUFh+/fXWcu/UDyASIXfg+7VzoCNNGOfWvoyU/x5pvVHr++ztyt/oSYI1BcWBBG/hmlNjA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 dev: true @@ -19874,7 +20047,7 @@ packages: resolution: {integrity: sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 dev: true @@ -19882,7 +20055,7 @@ packages: /string.prototype.trimend@1.0.7: resolution: {integrity: sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 dev: true @@ -19890,7 +20063,7 @@ packages: /string.prototype.trimstart@1.0.7: resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.22.3 dev: true @@ -20654,8 +20827,8 @@ packages: resolution: {integrity: sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 - get-intrinsic: 1.2.2 + call-bind: 1.0.7 + get-intrinsic: 1.2.4 is-typed-array: 1.1.12 dev: true @@ -20663,9 +20836,9 @@ packages: resolution: {integrity: sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 for-each: 0.3.3 - has-proto: 1.0.1 + has-proto: 1.0.3 is-typed-array: 1.1.12 dev: true @@ -20674,16 +20847,16 @@ packages: engines: {node: '>= 0.4'} dependencies: available-typed-arrays: 1.0.5 - call-bind: 1.0.5 + call-bind: 1.0.7 for-each: 0.3.3 - has-proto: 1.0.1 + has-proto: 1.0.3 is-typed-array: 1.1.12 dev: true /typed-array-length@1.0.4: resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 for-each: 0.3.3 is-typed-array: 1.1.12 dev: true @@ -20740,7 +20913,7 @@ packages: /unbox-primitive@1.0.2: resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 has-bigints: 1.0.2 has-symbols: 1.0.3 which-boxed-primitive: 1.0.2 @@ -21442,7 +21615,7 @@ packages: engines: {node: '>= 0.4'} dependencies: available-typed-arrays: 1.0.5 - call-bind: 1.0.5 + call-bind: 1.0.7 for-each: 0.3.3 gopd: 1.0.1 has-tostringtag: 1.0.0 From 718f138ac3afdb4bfc698940e72399dd016231b7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 08:18:14 +0100 Subject: [PATCH 014/121] Update dependency webpack to v5.94.0 [SECURITY] (#131) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- pnpm-lock.yaml | 562 +++++++++++++++++++++++++++++-------------------- 1 file changed, 334 insertions(+), 228 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 016f7b0c..2b9f35fe 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -223,7 +223,7 @@ importers: version: 1.18.4 babel-loader: specifier: ^8.0.0 - version: 8.3.0(@babel/core@7.23.7)(webpack@5.89.0) + version: 8.3.0(@babel/core@7.23.7)(webpack@5.94.0) babel-preset-react-app: specifier: ^10.0.0 version: 10.0.1 @@ -235,7 +235,7 @@ importers: version: 7.0.3 css-loader: specifier: ^6.0.0 - version: 6.9.0(webpack@5.89.0) + version: 6.9.0(webpack@5.94.0) dotenv-cli: specifier: ^6.0.0 version: 6.0.0 @@ -244,7 +244,7 @@ importers: version: 8.56.0 html-webpack-plugin: specifier: ^5.0.0 - version: 5.6.0(webpack@5.89.0) + version: 5.6.0(webpack@5.94.0) npm-run-all: specifier: ^4.1.5 version: 4.1.5 @@ -256,7 +256,7 @@ importers: version: 3.0.2 style-loader: specifier: ^3.0.0 - version: 3.3.4(webpack@5.89.0) + version: 3.3.4(webpack@5.94.0) ts-node: specifier: ^10.0.0 version: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) @@ -265,13 +265,13 @@ importers: version: 4.9.5 webpack: specifier: ^5.0.0 - version: 5.89.0(webpack-cli@4.10.0) + version: 5.94.0(webpack-cli@4.10.0) webpack-cli: specifier: ^4.0.0 - version: 4.10.0(webpack-dev-server@4.15.1)(webpack@5.89.0) + version: 4.10.0(webpack-dev-server@4.15.1)(webpack@5.94.0) webpack-dev-server: specifier: ^4.0.0 - version: 4.15.1(webpack-cli@4.10.0)(webpack@5.89.0) + version: 4.15.1(webpack-cli@4.10.0)(webpack@5.94.0) demo/api: dependencies: @@ -418,7 +418,7 @@ importers: version: 8.3.2 webpack: specifier: ^5.64.2 - version: 5.89.0(webpack-cli@4.10.0) + version: 5.94.0(webpack-cli@4.10.0) devDependencies: '@comet/eslint-config': specifier: ^7.5.0 @@ -476,7 +476,7 @@ importers: version: 27.1.5(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5) ts-loader: specifier: ^8.0.8 - version: 8.4.0(typescript@4.9.5)(webpack@5.89.0) + version: 8.4.0(typescript@4.9.5)(webpack@5.94.0) ts-node: specifier: ^10.0.0 version: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) @@ -1065,8 +1065,8 @@ packages: resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==} engines: {node: '>=6.0.0'} dependencies: - '@jridgewell/gen-mapping': 0.3.3 - '@jridgewell/trace-mapping': 0.3.21 + '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/trace-mapping': 0.3.25 /@angular-devkit/core@16.0.1(chokidar@3.5.3): resolution: {integrity: sha512-2uz98IqkKJlgnHbWQ7VeL4pb+snGAZXIama2KXi+k9GsRntdcw+udX8rL3G9SdUGUF+m6+147Y1oRBMHsO/v4w==} @@ -2180,7 +2180,7 @@ packages: dependencies: '@babel/compat-data': 7.23.5 '@babel/helper-validator-option': 7.23.5 - browserslist: 4.22.2 + browserslist: 4.24.2 lru-cache: 5.1.1 semver: 6.3.1 @@ -4751,7 +4751,7 @@ packages: optional: true dependencies: '@formatjs/icu-messageformat-parser': 2.1.0 - '@types/node': 17.0.45 + '@types/node': 14.18.63 chalk: 4.1.2 tslib: 2.6.2 typescript: 4.9.5 @@ -5660,7 +5660,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 18.19.8 + '@types/node': 22.9.0 chalk: 4.1.2 jest-message-util: 29.7.0 jest-util: 29.7.0 @@ -5726,14 +5726,14 @@ packages: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.8 + '@types/node': 22.9.0 ansi-escapes: 4.3.2 chalk: 4.1.2 ci-info: 3.9.0 exit: 0.1.2 graceful-fs: 4.2.11 jest-changed-files: 29.7.0 - jest-config: 29.7.0(@types/node@18.19.8)(ts-node@10.9.2) + jest-config: 29.7.0(@types/node@22.9.0)(ts-node@10.9.2) jest-haste-map: 29.7.0 jest-message-util: 29.7.0 jest-regex-util: 29.6.3 @@ -5771,7 +5771,7 @@ packages: dependencies: '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.8 + '@types/node': 22.9.0 jest-mock: 29.7.0 dev: true @@ -5810,7 +5810,7 @@ packages: dependencies: '@jest/types': 29.6.3 '@sinonjs/fake-timers': 10.3.0 - '@types/node': 18.19.8 + '@types/node': 22.9.0 jest-message-util: 29.7.0 jest-mock: 29.7.0 jest-util: 29.7.0 @@ -5889,8 +5889,8 @@ packages: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@jridgewell/trace-mapping': 0.3.21 - '@types/node': 18.19.8 + '@jridgewell/trace-mapping': 0.3.25 + '@types/node': 22.9.0 chalk: 4.1.2 collect-v8-coverage: 1.0.2 exit: 0.1.2 @@ -5932,7 +5932,7 @@ packages: resolution: {integrity: sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@jridgewell/trace-mapping': 0.3.21 + '@jridgewell/trace-mapping': 0.3.25 callsites: 3.1.0 graceful-fs: 4.2.11 dev: true @@ -6008,7 +6008,7 @@ packages: dependencies: '@babel/core': 7.23.7 '@jest/types': 29.6.3 - '@jridgewell/trace-mapping': 0.3.21 + '@jridgewell/trace-mapping': 0.3.25 babel-plugin-istanbul: 6.1.1 chalk: 4.1.2 convert-source-map: 2.0.0 @@ -6043,7 +6043,7 @@ packages: '@jest/schemas': 29.6.3 '@types/istanbul-lib-coverage': 2.0.6 '@types/istanbul-reports': 3.0.4 - '@types/node': 18.19.8 + '@types/node': 22.9.0 '@types/yargs': 17.0.32 chalk: 4.1.2 dev: true @@ -6056,38 +6056,52 @@ packages: resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==} engines: {node: '>=6.0.0'} dependencies: - '@jridgewell/set-array': 1.1.2 - '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/set-array': 1.2.1 + '@jridgewell/sourcemap-codec': 1.5.0 '@jridgewell/trace-mapping': 0.3.21 - /@jridgewell/resolve-uri@3.1.1: - resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==} + /@jridgewell/gen-mapping@0.3.5: + resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} + engines: {node: '>=6.0.0'} + dependencies: + '@jridgewell/set-array': 1.2.1 + '@jridgewell/sourcemap-codec': 1.5.0 + '@jridgewell/trace-mapping': 0.3.25 + + /@jridgewell/resolve-uri@3.1.2: + resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==} engines: {node: '>=6.0.0'} - /@jridgewell/set-array@1.1.2: - resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==} + /@jridgewell/set-array@1.2.1: + resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==} engines: {node: '>=6.0.0'} - /@jridgewell/source-map@0.3.5: - resolution: {integrity: sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==} + /@jridgewell/source-map@0.3.6: + resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==} dependencies: - '@jridgewell/gen-mapping': 0.3.3 - '@jridgewell/trace-mapping': 0.3.21 + '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/trace-mapping': 0.3.25 - /@jridgewell/sourcemap-codec@1.4.15: - resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} + /@jridgewell/sourcemap-codec@1.5.0: + resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} /@jridgewell/trace-mapping@0.3.21: resolution: {integrity: sha512-SRfKmRe1KvYnxjEMtxEr+J4HIeMX5YBg/qhRHpxEIGjhX1rshcHlnFUE9K0GazhVKWM7B+nARSkV8LuvJdJ5/g==} dependencies: - '@jridgewell/resolve-uri': 3.1.1 - '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/resolve-uri': 3.1.2 + '@jridgewell/sourcemap-codec': 1.5.0 + + /@jridgewell/trace-mapping@0.3.25: + resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} + dependencies: + '@jridgewell/resolve-uri': 3.1.2 + '@jridgewell/sourcemap-codec': 1.5.0 /@jridgewell/trace-mapping@0.3.9: resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==} dependencies: - '@jridgewell/resolve-uri': 3.1.1 - '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/resolve-uri': 3.1.2 + '@jridgewell/sourcemap-codec': 1.5.0 /@kubernetes/client-node@0.18.1: resolution: {integrity: sha512-F3JiK9iZnbh81O/da1tD0h8fQMi/MDttWc/JydyUVnjPEom55wVfnpl4zQ/sWD4uKB8FlxYRPiLwV2ZXB+xPKw==} @@ -8758,20 +8772,22 @@ packages: resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==} dependencies: '@types/eslint': 8.56.2 - '@types/estree': 1.0.5 + '@types/estree': 1.0.6 + dev: true /@types/eslint@8.56.2: resolution: {integrity: sha512-uQDwm1wFHmbBbCZCqAlq6Do9LYwByNZHWzXppSnay9SuwJ+VRbjkbLABer54kcPnMSlG6Fdiy2yaFXm/z9Z5gw==} dependencies: - '@types/estree': 1.0.5 + '@types/estree': 1.0.6 '@types/json-schema': 7.0.15 + dev: true /@types/estree@0.0.50: resolution: {integrity: sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==} dev: true - /@types/estree@1.0.5: - resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} + /@types/estree@1.0.6: + resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==} /@types/express-serve-static-core@4.17.31: resolution: {integrity: sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==} @@ -9082,6 +9098,12 @@ packages: dependencies: undici-types: 5.26.5 + /@types/node@22.9.0: + resolution: {integrity: sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==} + dependencies: + undici-types: 6.19.8 + dev: true + /@types/normalize-package-data@2.4.4: resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} dev: true @@ -9550,105 +9572,105 @@ packages: resolution: {integrity: sha512-nmi3BtLpvqXAWoRZ6HQ+pFJOHBU4UnH3vD3opgmwXac7vhaHKA9nj1VeGjMggdB9eLtW83eHyPCmOU1qzdsC7Q==} dev: true - /@webassemblyjs/ast@1.11.6: - resolution: {integrity: sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==} + /@webassemblyjs/ast@1.14.1: + resolution: {integrity: sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==} dependencies: - '@webassemblyjs/helper-numbers': 1.11.6 - '@webassemblyjs/helper-wasm-bytecode': 1.11.6 + '@webassemblyjs/helper-numbers': 1.13.2 + '@webassemblyjs/helper-wasm-bytecode': 1.13.2 - /@webassemblyjs/floating-point-hex-parser@1.11.6: - resolution: {integrity: sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==} + /@webassemblyjs/floating-point-hex-parser@1.13.2: + resolution: {integrity: sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==} - /@webassemblyjs/helper-api-error@1.11.6: - resolution: {integrity: sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==} + /@webassemblyjs/helper-api-error@1.13.2: + resolution: {integrity: sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==} - /@webassemblyjs/helper-buffer@1.11.6: - resolution: {integrity: sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==} + /@webassemblyjs/helper-buffer@1.14.1: + resolution: {integrity: sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==} - /@webassemblyjs/helper-numbers@1.11.6: - resolution: {integrity: sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==} + /@webassemblyjs/helper-numbers@1.13.2: + resolution: {integrity: sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==} dependencies: - '@webassemblyjs/floating-point-hex-parser': 1.11.6 - '@webassemblyjs/helper-api-error': 1.11.6 + '@webassemblyjs/floating-point-hex-parser': 1.13.2 + '@webassemblyjs/helper-api-error': 1.13.2 '@xtuc/long': 4.2.2 - /@webassemblyjs/helper-wasm-bytecode@1.11.6: - resolution: {integrity: sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==} + /@webassemblyjs/helper-wasm-bytecode@1.13.2: + resolution: {integrity: sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==} - /@webassemblyjs/helper-wasm-section@1.11.6: - resolution: {integrity: sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==} + /@webassemblyjs/helper-wasm-section@1.14.1: + resolution: {integrity: sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==} dependencies: - '@webassemblyjs/ast': 1.11.6 - '@webassemblyjs/helper-buffer': 1.11.6 - '@webassemblyjs/helper-wasm-bytecode': 1.11.6 - '@webassemblyjs/wasm-gen': 1.11.6 + '@webassemblyjs/ast': 1.14.1 + '@webassemblyjs/helper-buffer': 1.14.1 + '@webassemblyjs/helper-wasm-bytecode': 1.13.2 + '@webassemblyjs/wasm-gen': 1.14.1 - /@webassemblyjs/ieee754@1.11.6: - resolution: {integrity: sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==} + /@webassemblyjs/ieee754@1.13.2: + resolution: {integrity: sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==} dependencies: '@xtuc/ieee754': 1.2.0 - /@webassemblyjs/leb128@1.11.6: - resolution: {integrity: sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==} + /@webassemblyjs/leb128@1.13.2: + resolution: {integrity: sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==} dependencies: '@xtuc/long': 4.2.2 - /@webassemblyjs/utf8@1.11.6: - resolution: {integrity: sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==} + /@webassemblyjs/utf8@1.13.2: + resolution: {integrity: sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==} - /@webassemblyjs/wasm-edit@1.11.6: - resolution: {integrity: sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==} + /@webassemblyjs/wasm-edit@1.14.1: + resolution: {integrity: sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==} dependencies: - '@webassemblyjs/ast': 1.11.6 - '@webassemblyjs/helper-buffer': 1.11.6 - '@webassemblyjs/helper-wasm-bytecode': 1.11.6 - '@webassemblyjs/helper-wasm-section': 1.11.6 - '@webassemblyjs/wasm-gen': 1.11.6 - '@webassemblyjs/wasm-opt': 1.11.6 - '@webassemblyjs/wasm-parser': 1.11.6 - '@webassemblyjs/wast-printer': 1.11.6 + '@webassemblyjs/ast': 1.14.1 + '@webassemblyjs/helper-buffer': 1.14.1 + '@webassemblyjs/helper-wasm-bytecode': 1.13.2 + '@webassemblyjs/helper-wasm-section': 1.14.1 + '@webassemblyjs/wasm-gen': 1.14.1 + '@webassemblyjs/wasm-opt': 1.14.1 + '@webassemblyjs/wasm-parser': 1.14.1 + '@webassemblyjs/wast-printer': 1.14.1 - /@webassemblyjs/wasm-gen@1.11.6: - resolution: {integrity: sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==} + /@webassemblyjs/wasm-gen@1.14.1: + resolution: {integrity: sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==} dependencies: - '@webassemblyjs/ast': 1.11.6 - '@webassemblyjs/helper-wasm-bytecode': 1.11.6 - '@webassemblyjs/ieee754': 1.11.6 - '@webassemblyjs/leb128': 1.11.6 - '@webassemblyjs/utf8': 1.11.6 + '@webassemblyjs/ast': 1.14.1 + '@webassemblyjs/helper-wasm-bytecode': 1.13.2 + '@webassemblyjs/ieee754': 1.13.2 + '@webassemblyjs/leb128': 1.13.2 + '@webassemblyjs/utf8': 1.13.2 - /@webassemblyjs/wasm-opt@1.11.6: - resolution: {integrity: sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==} + /@webassemblyjs/wasm-opt@1.14.1: + resolution: {integrity: sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==} dependencies: - '@webassemblyjs/ast': 1.11.6 - '@webassemblyjs/helper-buffer': 1.11.6 - '@webassemblyjs/wasm-gen': 1.11.6 - '@webassemblyjs/wasm-parser': 1.11.6 + '@webassemblyjs/ast': 1.14.1 + '@webassemblyjs/helper-buffer': 1.14.1 + '@webassemblyjs/wasm-gen': 1.14.1 + '@webassemblyjs/wasm-parser': 1.14.1 - /@webassemblyjs/wasm-parser@1.11.6: - resolution: {integrity: sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==} + /@webassemblyjs/wasm-parser@1.14.1: + resolution: {integrity: sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==} dependencies: - '@webassemblyjs/ast': 1.11.6 - '@webassemblyjs/helper-api-error': 1.11.6 - '@webassemblyjs/helper-wasm-bytecode': 1.11.6 - '@webassemblyjs/ieee754': 1.11.6 - '@webassemblyjs/leb128': 1.11.6 - '@webassemblyjs/utf8': 1.11.6 + '@webassemblyjs/ast': 1.14.1 + '@webassemblyjs/helper-api-error': 1.13.2 + '@webassemblyjs/helper-wasm-bytecode': 1.13.2 + '@webassemblyjs/ieee754': 1.13.2 + '@webassemblyjs/leb128': 1.13.2 + '@webassemblyjs/utf8': 1.13.2 - /@webassemblyjs/wast-printer@1.11.6: - resolution: {integrity: sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==} + /@webassemblyjs/wast-printer@1.14.1: + resolution: {integrity: sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==} dependencies: - '@webassemblyjs/ast': 1.11.6 + '@webassemblyjs/ast': 1.14.1 '@xtuc/long': 4.2.2 - /@webpack-cli/configtest@1.2.0(webpack-cli@4.10.0)(webpack@5.89.0): + /@webpack-cli/configtest@1.2.0(webpack-cli@4.10.0)(webpack@5.94.0): resolution: {integrity: sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==} peerDependencies: webpack: 4.x.x || 5.x.x webpack-cli: 4.x.x dependencies: - webpack: 5.89.0(webpack-cli@4.10.0) - webpack-cli: 4.10.0(webpack-dev-server@4.15.1)(webpack@5.89.0) + webpack: 5.94.0(webpack-cli@4.10.0) + webpack-cli: 4.10.0(webpack-dev-server@4.15.1)(webpack@5.94.0) /@webpack-cli/info@1.5.0(webpack-cli@4.10.0): resolution: {integrity: sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==} @@ -9656,7 +9678,7 @@ packages: webpack-cli: 4.x.x dependencies: envinfo: 7.11.0 - webpack-cli: 4.10.0(webpack-dev-server@4.15.1)(webpack@5.89.0) + webpack-cli: 4.10.0(webpack-dev-server@4.15.1)(webpack@5.94.0) /@webpack-cli/serve@1.7.0(webpack-cli@4.10.0)(webpack-dev-server@4.15.1): resolution: {integrity: sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==} @@ -9667,8 +9689,8 @@ packages: webpack-dev-server: optional: true dependencies: - webpack-cli: 4.10.0(webpack-dev-server@4.15.1)(webpack@5.89.0) - webpack-dev-server: 4.15.1(webpack-cli@4.10.0)(webpack@5.89.0) + webpack-cli: 4.10.0(webpack-dev-server@4.15.1)(webpack@5.94.0) + webpack-dev-server: 4.15.1(webpack-cli@4.10.0)(webpack@5.94.0) /@whatwg-node/events@0.0.2: resolution: {integrity: sha512-WKj/lI4QjnLuPrim0cfO7i+HsDSXHxNv1y0CrJhdntuO3hxWZmnXCwNDnwOvry11OjRin6cgWNF+j/9Pn8TN4w==} @@ -9781,25 +9803,32 @@ packages: acorn-walk: 7.2.0 dev: true - /acorn-import-assertions@1.9.0(acorn@8.11.3): + /acorn-import-assertions@1.9.0(acorn@8.14.0): resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==} peerDependencies: acorn: ^8 dependencies: - acorn: 8.11.3 + acorn: 8.14.0 + + /acorn-import-attributes@1.9.5(acorn@8.14.0): + resolution: {integrity: sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==} + peerDependencies: + acorn: ^8 + dependencies: + acorn: 8.14.0 - /acorn-jsx@5.3.2(acorn@8.11.3): + /acorn-jsx@5.3.2(acorn@8.14.0): resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - acorn: 8.11.3 + acorn: 8.14.0 /acorn-loose@8.3.0: resolution: {integrity: sha512-75lAs9H19ldmW+fAbyqHdjgdCrz0pWGXKmnqFoh8PyVd1L2RIb4RzYrSjmopeqv3E1G3/Pimu6GgLlrGbrkF7w==} engines: {node: '>=0.4.0'} dependencies: - acorn: 8.11.3 + acorn: 8.14.0 /acorn-walk@7.2.0: resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==} @@ -9825,6 +9854,11 @@ packages: engines: {node: '>=0.4.0'} hasBin: true + /acorn@8.14.0: + resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==} + engines: {node: '>=0.4.0'} + hasBin: true + /agent-base@6.0.2: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} @@ -9853,7 +9887,7 @@ packages: /ajv-formats@2.1.1: resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==} dependencies: - ajv: 8.12.0 + ajv: 8.17.1 /ajv-keywords@3.5.2(ajv@6.12.6): resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} @@ -9862,12 +9896,12 @@ packages: dependencies: ajv: 6.12.6 - /ajv-keywords@5.1.0(ajv@8.12.0): + /ajv-keywords@5.1.0(ajv@8.17.1): resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==} peerDependencies: ajv: ^8.8.2 dependencies: - ajv: 8.12.0 + ajv: 8.17.1 fast-deep-equal: 3.1.3 /ajv@6.12.6: @@ -9885,6 +9919,15 @@ packages: json-schema-traverse: 1.0.0 require-from-string: 2.0.2 uri-js: 4.4.1 + dev: true + + /ajv@8.17.1: + resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==} + dependencies: + fast-deep-equal: 3.1.3 + fast-uri: 3.0.3 + json-schema-traverse: 1.0.0 + require-from-string: 2.0.2 /ansi-colors@4.1.3: resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} @@ -10354,7 +10397,7 @@ packages: - supports-color dev: true - /babel-loader@8.3.0(@babel/core@7.23.7)(webpack@5.89.0): + /babel-loader@8.3.0(@babel/core@7.23.7)(webpack@5.94.0): resolution: {integrity: sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==} engines: {node: '>= 8.9'} peerDependencies: @@ -10366,7 +10409,7 @@ packages: loader-utils: 2.0.4 make-dir: 3.1.0 schema-utils: 2.7.1 - webpack: 5.89.0(webpack-cli@4.10.0) + webpack: 5.94.0(webpack-cli@4.10.0) dev: true /babel-plugin-istanbul@6.1.1: @@ -10737,15 +10780,15 @@ packages: resolution: {integrity: sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==} dev: true - /browserslist@4.22.2: - resolution: {integrity: sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==} + /browserslist@4.24.2: + resolution: {integrity: sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001578 - electron-to-chromium: 1.4.635 - node-releases: 2.0.14 - update-browserslist-db: 1.0.13(browserslist@4.22.2) + caniuse-lite: 1.0.30001680 + electron-to-chromium: 1.5.58 + node-releases: 2.0.18 + update-browserslist-db: 1.1.1(browserslist@4.24.2) /bs-logger@0.2.6: resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==} @@ -10917,12 +10960,12 @@ packages: resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==} dev: false - /caniuse-lite@1.0.30001578: - resolution: {integrity: sha512-J/jkFgsQ3NEl4w2lCoM9ZPxrD+FoBNJ7uJUpGVjIg/j0OwJosWM36EPDv+Yyi0V4twBk9pPmlFS+PLykgEvUmg==} - /caniuse-lite@1.0.30001676: resolution: {integrity: sha512-Qz6zwGCiPghQXGJvgQAem79esjitvJ+CxSbSQkW9H/UX5hg8XM88d4lp2W+MEQ81j+Hip58Il+jGVdazk1z9cw==} + /caniuse-lite@1.0.30001680: + resolution: {integrity: sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==} + /capital-case@1.0.4: resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==} dependencies: @@ -11083,8 +11126,8 @@ packages: /chroma-js@2.4.2: resolution: {integrity: sha512-U9eDw6+wt7V8z5NncY2jJfZa+hUH8XEj8FQHgFJTrUFnJfXYf4Ml4adI2vXZOjqRDpFWtYVWypDfZwnJ+HIR4A==} - /chrome-trace-event@1.0.3: - resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==} + /chrome-trace-event@1.0.4: + resolution: {integrity: sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==} engines: {node: '>=6.0'} /ci-info@3.9.0: @@ -11456,7 +11499,7 @@ packages: /core-js-compat@3.35.0: resolution: {integrity: sha512-5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw==} dependencies: - browserslist: 4.22.2 + browserslist: 4.24.2 dev: true /core-js@3.35.0: @@ -11606,7 +11649,7 @@ packages: engines: {node: '>=4'} dev: false - /css-loader@6.9.0(webpack@5.89.0): + /css-loader@6.9.0(webpack@5.94.0): resolution: {integrity: sha512-3I5Nu4ytWlHvOP6zItjiHlefBNtrH+oehq8tnQa2kO305qpVyx9XNIT1CXIj5bgCJs7qICBCkgCYxQLKPANoLA==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -11620,7 +11663,7 @@ packages: postcss-modules-values: 4.0.0(postcss@8.4.33) postcss-value-parser: 4.2.0 semver: 7.5.4 - webpack: 5.89.0(webpack-cli@4.10.0) + webpack: 5.94.0(webpack-cli@4.10.0) dev: true /css-select@4.3.0: @@ -12230,8 +12273,8 @@ packages: /ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} - /electron-to-chromium@1.4.635: - resolution: {integrity: sha512-iu/2D0zolKU3iDGXXxdOzNf72Jnokn+K1IN6Kk4iV6l1Tr2g/qy+mvmtfAiBwZe5S3aB5r92vp+zSZ69scYRrg==} + /electron-to-chromium@1.5.58: + resolution: {integrity: sha512-al2l4r+24ZFL7WzyPTlyD0fC33LLzvxqLCwurtBibVPghRGO9hSTl+tis8t1kD7biPiH/en4U0I7o/nQbYeoVA==} /emittery@0.13.1: resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==} @@ -12289,6 +12332,14 @@ packages: dependencies: graceful-fs: 4.2.11 tapable: 2.2.1 + dev: true + + /enhanced-resolve@5.17.1: + resolution: {integrity: sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==} + engines: {node: '>=10.13.0'} + dependencies: + graceful-fs: 4.2.11 + tapable: 2.2.1 /enquirer@2.4.1: resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==} @@ -12396,8 +12447,8 @@ packages: safe-array-concat: 1.1.0 dev: true - /es-module-lexer@1.4.1: - resolution: {integrity: sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==} + /es-module-lexer@1.5.4: + resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==} /es-set-tostringtag@2.0.2: resolution: {integrity: sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==} @@ -12427,6 +12478,10 @@ packages: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} engines: {node: '>=6'} + /escalade@3.2.0: + resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==} + engines: {node: '>=6'} + /escape-goat@3.0.0: resolution: {integrity: sha512-w3PwNZJwRxlp47QGzhuEBldEqVHHhh8/tIPcl6ecf2Bou99cdAt0knihBV0Ecc7CGxYduXVBDheH1K2oADRlvw==} engines: {node: '>=10'} @@ -12827,8 +12882,8 @@ packages: resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - acorn: 8.11.3 - acorn-jsx: 5.3.2(acorn@8.11.3) + acorn: 8.14.0 + acorn-jsx: 5.3.2(acorn@8.14.0) eslint-visitor-keys: 3.4.3 /esprima@4.0.1: @@ -13133,6 +13188,9 @@ packages: /fast-safe-stringify@2.1.1: resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==} + /fast-uri@3.0.3: + resolution: {integrity: sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==} + /fast-url-parser@1.1.3: resolution: {integrity: sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==} dependencies: @@ -14094,7 +14152,7 @@ packages: he: 1.2.0 param-case: 3.0.4 relateurl: 0.2.7 - terser: 5.26.0 + terser: 5.36.0 dev: true /html-minifier@4.0.0: @@ -14111,7 +14169,7 @@ packages: uglify-js: 3.17.4 dev: false - /html-webpack-plugin@5.6.0(webpack@5.89.0): + /html-webpack-plugin@5.6.0(webpack@5.94.0): resolution: {integrity: sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==} engines: {node: '>=10.13.0'} peerDependencies: @@ -14128,7 +14186,7 @@ packages: lodash: 4.17.21 pretty-error: 4.0.0 tapable: 2.2.1 - webpack: 5.89.0(webpack-cli@4.10.0) + webpack: 5.94.0(webpack-cli@4.10.0) dev: true /htmlparser2@5.0.1: @@ -14367,8 +14425,8 @@ packages: /import-in-the-middle@1.7.1: resolution: {integrity: sha512-1LrZPDtW+atAxH42S6288qyDFNQ2YCty+2mxEPRtfazH6Z5QwkaBSTS2ods7hnVJioF6rkRfNoA6A/MstpFXLg==} dependencies: - acorn: 8.11.3 - acorn-import-assertions: 1.9.0(acorn@8.11.3) + acorn: 8.14.0 + acorn-import-assertions: 1.9.0(acorn@8.14.0) cjs-module-lexer: 1.2.3 module-details-from-path: 1.0.3 dev: false @@ -15016,7 +15074,7 @@ packages: '@jest/expect': 29.7.0 '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.8 + '@types/node': 22.9.0 chalk: 4.1.2 co: 4.6.0 dedent: 1.5.1 @@ -15177,6 +15235,47 @@ packages: - supports-color dev: true + /jest-config@29.7.0(@types/node@22.9.0)(ts-node@10.9.2): + resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==} + engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + peerDependencies: + '@types/node': '*' + ts-node: '>=9.0.0' + peerDependenciesMeta: + '@types/node': + optional: true + ts-node: + optional: true + dependencies: + '@babel/core': 7.23.7 + '@jest/test-sequencer': 29.7.0 + '@jest/types': 29.6.3 + '@types/node': 22.9.0 + babel-jest: 29.7.0(@babel/core@7.23.7) + chalk: 4.1.2 + ci-info: 3.9.0 + deepmerge: 4.3.1 + glob: 7.2.3 + graceful-fs: 4.2.11 + jest-circus: 29.7.0 + jest-environment-node: 29.7.0 + jest-get-type: 29.6.3 + jest-regex-util: 29.6.3 + jest-resolve: 29.7.0 + jest-runner: 29.7.0 + jest-util: 29.7.0 + jest-validate: 29.7.0 + micromatch: 4.0.5 + parse-json: 5.2.0 + pretty-format: 29.7.0 + slash: 3.0.0 + strip-json-comments: 3.1.1 + ts-node: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) + transitivePeerDependencies: + - babel-plugin-macros + - supports-color + dev: true + /jest-diff@27.5.1: resolution: {integrity: sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -15270,7 +15369,7 @@ packages: '@jest/environment': 29.7.0 '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.8 + '@types/node': 22.9.0 jest-mock: 29.7.0 jest-util: 29.7.0 dev: true @@ -15311,7 +15410,7 @@ packages: dependencies: '@jest/types': 29.6.3 '@types/graceful-fs': 4.1.9 - '@types/node': 18.19.8 + '@types/node': 22.9.0 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 @@ -15448,7 +15547,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 18.19.8 + '@types/node': 22.9.0 jest-util: 29.7.0 dev: true @@ -15579,7 +15678,7 @@ packages: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.8 + '@types/node': 22.9.0 chalk: 4.1.2 emittery: 0.13.1 graceful-fs: 4.2.11 @@ -15640,7 +15739,7 @@ packages: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.8 + '@types/node': 22.9.0 chalk: 4.1.2 cjs-module-lexer: 1.2.3 collect-v8-coverage: 1.0.2 @@ -15742,7 +15841,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 18.19.8 + '@types/node': 22.9.0 chalk: 4.1.2 ci-info: 3.9.0 graceful-fs: 4.2.11 @@ -15792,7 +15891,7 @@ packages: dependencies: '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.8 + '@types/node': 22.9.0 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.13.1 @@ -15812,7 +15911,7 @@ packages: resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@types/node': 18.19.8 + '@types/node': 22.9.0 jest-util: 29.7.0 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -15942,7 +16041,7 @@ packages: optional: true dependencies: abab: 2.0.6 - acorn: 8.11.3 + acorn: 8.14.0 acorn-globals: 6.0.0 cssom: 0.4.4 cssstyle: 2.3.0 @@ -16222,7 +16321,7 @@ packages: colorette: 2.0.19 commander: 10.0.1 debug: 4.3.4(supports-color@9.4.0) - escalade: 3.1.1 + escalade: 3.2.0 esm: 3.2.25 get-package-type: 0.1.0 getopts: 2.3.0 @@ -16251,7 +16350,7 @@ packages: /launch-editor@2.6.1: resolution: {integrity: sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==} dependencies: - picocolors: 1.0.0 + picocolors: 1.1.1 shell-quote: 1.8.1 /lazystream@1.0.1: @@ -16615,14 +16714,14 @@ packages: resolution: {integrity: sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==} engines: {node: '>=12'} dependencies: - '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/sourcemap-codec': 1.5.0 dev: true /magic-string@0.30.5: resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==} engines: {node: '>=12'} dependencies: - '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/sourcemap-codec': 1.5.0 dev: true /make-dir@2.1.0: @@ -17505,8 +17604,8 @@ packages: resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==} dev: true - /node-releases@2.0.14: - resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==} + /node-releases@2.0.18: + resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==} /nopt@7.2.1: resolution: {integrity: sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==} @@ -18195,6 +18294,10 @@ packages: /picocolors@1.0.0: resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} + dev: true + + /picocolors@1.1.1: + resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} /picomatch@2.3.1: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} @@ -18319,7 +18422,7 @@ packages: engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.7 - picocolors: 1.0.0 + picocolors: 1.1.1 source-map-js: 1.0.2 /postcss@8.4.33: @@ -18336,7 +18439,7 @@ packages: engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.7 - picocolors: 1.0.0 + picocolors: 1.1.1 source-map-js: 1.2.1 dev: false @@ -19450,9 +19553,9 @@ packages: engines: {node: '>= 12.13.0'} dependencies: '@types/json-schema': 7.0.15 - ajv: 8.12.0 + ajv: 8.17.1 ajv-formats: 2.1.1 - ajv-keywords: 5.1.0(ajv@8.12.0) + ajv-keywords: 5.1.0(ajv@8.17.1) /scroll-into-view-if-needed@2.2.31: resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==} @@ -20154,13 +20257,13 @@ packages: peek-readable: 5.0.0 dev: true - /style-loader@3.3.4(webpack@5.89.0): + /style-loader@3.3.4(webpack@5.94.0): resolution: {integrity: sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==} engines: {node: '>= 12.13.0'} peerDependencies: webpack: ^5.0.0 dependencies: - webpack: 5.89.0(webpack-cli@4.10.0) + webpack: 5.94.0(webpack-cli@4.10.0) dev: true /styled-components@6.1.13(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1): @@ -20358,15 +20461,15 @@ packages: uglify-js: optional: true dependencies: - '@jridgewell/trace-mapping': 0.3.21 + '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 3.3.0 serialize-javascript: 6.0.2 - terser: 5.26.0 + terser: 5.36.0 webpack: 5.82.1 dev: true - /terser-webpack-plugin@5.3.10(webpack@5.89.0): + /terser-webpack-plugin@5.3.10(webpack@5.94.0): resolution: {integrity: sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==} engines: {node: '>= 10.13.0'} peerDependencies: @@ -20382,20 +20485,20 @@ packages: uglify-js: optional: true dependencies: - '@jridgewell/trace-mapping': 0.3.21 + '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 3.3.0 serialize-javascript: 6.0.2 - terser: 5.26.0 - webpack: 5.89.0(webpack-cli@4.10.0) + terser: 5.36.0 + webpack: 5.94.0(webpack-cli@4.10.0) - /terser@5.26.0: - resolution: {integrity: sha512-dytTGoE2oHgbNV9nTzgBEPaqAWvcJNl66VZ0BkJqlvp71IjO8CxdBx/ykCNb47cLnCmCvRZ6ZR0tLkqvZCdVBQ==} + /terser@5.36.0: + resolution: {integrity: sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==} engines: {node: '>=10'} hasBin: true dependencies: - '@jridgewell/source-map': 0.3.5 - acorn: 8.11.3 + '@jridgewell/source-map': 0.3.6 + acorn: 8.14.0 commander: 2.20.3 source-map-support: 0.5.21 @@ -20625,7 +20728,7 @@ packages: yargs-parser: 21.1.1 dev: true - /ts-loader@8.4.0(typescript@4.9.5)(webpack@5.89.0): + /ts-loader@8.4.0(typescript@4.9.5)(webpack@5.94.0): resolution: {integrity: sha512-6nFY3IZ2//mrPc+ImY3hNWx1vCHyEhl6V+wLmL4CZcm6g1CqX7UKrkc6y0i4FwcfOhxyMPCfaEvh20f4r9GNpw==} engines: {node: '>=10.0.0'} peerDependencies: @@ -20638,7 +20741,7 @@ packages: micromatch: 4.0.5 semver: 7.5.4 typescript: 4.9.5 - webpack: 5.89.0(webpack-cli@4.10.0) + webpack: 5.94.0(webpack-cli@4.10.0) dev: true /ts-log@2.2.5: @@ -20686,7 +20789,7 @@ packages: engines: {node: '>=10.13.0'} dependencies: chalk: 4.1.2 - enhanced-resolve: 5.15.0 + enhanced-resolve: 5.17.1 tsconfig-paths: 4.2.0 dev: true @@ -20930,6 +21033,10 @@ packages: /undici-types@5.26.5: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} + /undici-types@6.19.8: + resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} + dev: true + /unicode-canonical-property-names-ecmascript@2.0.0: resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==} engines: {node: '>=4'} @@ -21012,15 +21119,15 @@ packages: readable-stream: 2.3.8 setimmediate: 1.0.5 - /update-browserslist-db@1.0.13(browserslist@4.22.2): - resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} + /update-browserslist-db@1.1.1(browserslist@4.24.2): + resolution: {integrity: sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' dependencies: - browserslist: 4.22.2 - escalade: 3.1.1 - picocolors: 1.0.0 + browserslist: 4.24.2 + escalade: 3.2.0 + picocolors: 1.1.1 /upper-case-first@2.0.2: resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==} @@ -21146,7 +21253,7 @@ packages: resolution: {integrity: sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==} engines: {node: '>=10.12.0'} dependencies: - '@jridgewell/trace-mapping': 0.3.21 + '@jridgewell/trace-mapping': 0.3.25 '@types/istanbul-lib-coverage': 2.0.6 convert-source-map: 2.0.0 dev: true @@ -21241,8 +21348,8 @@ packages: makeerror: 1.0.12 dev: true - /watchpack@2.4.0: - resolution: {integrity: sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==} + /watchpack@2.4.2: + resolution: {integrity: sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==} engines: {node: '>=10.13.0'} dependencies: glob-to-regexp: 0.4.1 @@ -21305,7 +21412,7 @@ packages: engines: {node: '>= 10.13.0'} hasBin: true dependencies: - acorn: 8.11.3 + acorn: 8.14.0 acorn-walk: 8.3.2 chalk: 4.1.2 commander: 6.2.1 @@ -21319,7 +21426,7 @@ packages: - utf-8-validate dev: false - /webpack-cli@4.10.0(webpack-dev-server@4.15.1)(webpack@5.89.0): + /webpack-cli@4.10.0(webpack-dev-server@4.15.1)(webpack@5.94.0): resolution: {integrity: sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==} engines: {node: '>=10.13.0'} hasBin: true @@ -21340,7 +21447,7 @@ packages: optional: true dependencies: '@discoveryjs/json-ext': 0.5.7 - '@webpack-cli/configtest': 1.2.0(webpack-cli@4.10.0)(webpack@5.89.0) + '@webpack-cli/configtest': 1.2.0(webpack-cli@4.10.0)(webpack@5.94.0) '@webpack-cli/info': 1.5.0(webpack-cli@4.10.0) '@webpack-cli/serve': 1.7.0(webpack-cli@4.10.0)(webpack-dev-server@4.15.1) colorette: 2.0.20 @@ -21350,11 +21457,11 @@ packages: import-local: 3.1.0 interpret: 2.2.0 rechoir: 0.7.1 - webpack: 5.89.0(webpack-cli@4.10.0) - webpack-dev-server: 4.15.1(webpack-cli@4.10.0)(webpack@5.89.0) + webpack: 5.94.0(webpack-cli@4.10.0) + webpack-dev-server: 4.15.1(webpack-cli@4.10.0)(webpack@5.94.0) webpack-merge: 5.10.0 - /webpack-dev-middleware@5.3.3(webpack@5.89.0): + /webpack-dev-middleware@5.3.3(webpack@5.94.0): resolution: {integrity: sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -21365,9 +21472,9 @@ packages: mime-types: 2.1.35 range-parser: 1.2.1 schema-utils: 4.2.0 - webpack: 5.89.0(webpack-cli@4.10.0) + webpack: 5.94.0(webpack-cli@4.10.0) - /webpack-dev-server@4.15.1(webpack-cli@4.10.0)(webpack@5.89.0): + /webpack-dev-server@4.15.1(webpack-cli@4.10.0)(webpack@5.94.0): resolution: {integrity: sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==} engines: {node: '>= 12.13.0'} hasBin: true @@ -21408,9 +21515,9 @@ packages: serve-index: 1.9.1 sockjs: 0.3.24 spdy: 4.0.2 - webpack: 5.89.0(webpack-cli@4.10.0) - webpack-cli: 4.10.0(webpack-dev-server@4.15.1)(webpack@5.89.0) - webpack-dev-middleware: 5.3.3(webpack@5.89.0) + webpack: 5.94.0(webpack-cli@4.10.0) + webpack-cli: 4.10.0(webpack-dev-server@4.15.1)(webpack@5.94.0) + webpack-dev-middleware: 5.3.3(webpack@5.94.0) ws: 8.16.0 transitivePeerDependencies: - bufferutil @@ -21446,16 +21553,16 @@ packages: optional: true dependencies: '@types/eslint-scope': 3.7.7 - '@types/estree': 1.0.5 - '@webassemblyjs/ast': 1.11.6 - '@webassemblyjs/wasm-edit': 1.11.6 - '@webassemblyjs/wasm-parser': 1.11.6 - acorn: 8.11.3 - acorn-import-assertions: 1.9.0(acorn@8.11.3) - browserslist: 4.22.2 - chrome-trace-event: 1.0.3 - enhanced-resolve: 5.15.0 - es-module-lexer: 1.4.1 + '@types/estree': 1.0.6 + '@webassemblyjs/ast': 1.14.1 + '@webassemblyjs/wasm-edit': 1.14.1 + '@webassemblyjs/wasm-parser': 1.14.1 + acorn: 8.14.0 + acorn-import-assertions: 1.9.0(acorn@8.14.0) + browserslist: 4.24.2 + chrome-trace-event: 1.0.4 + enhanced-resolve: 5.17.1 + es-module-lexer: 1.5.4 eslint-scope: 5.1.1 events: 3.3.0 glob-to-regexp: 0.4.1 @@ -21467,7 +21574,7 @@ packages: schema-utils: 3.3.0 tapable: 2.2.1 terser-webpack-plugin: 5.3.10(webpack@5.82.1) - watchpack: 2.4.0 + watchpack: 2.4.2 webpack-sources: 3.2.3 transitivePeerDependencies: - '@swc/core' @@ -21475,8 +21582,8 @@ packages: - uglify-js dev: true - /webpack@5.89.0(webpack-cli@4.10.0): - resolution: {integrity: sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==} + /webpack@5.94.0(webpack-cli@4.10.0): + resolution: {integrity: sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==} engines: {node: '>=10.13.0'} hasBin: true peerDependencies: @@ -21485,17 +21592,16 @@ packages: webpack-cli: optional: true dependencies: - '@types/eslint-scope': 3.7.7 - '@types/estree': 1.0.5 - '@webassemblyjs/ast': 1.11.6 - '@webassemblyjs/wasm-edit': 1.11.6 - '@webassemblyjs/wasm-parser': 1.11.6 - acorn: 8.11.3 - acorn-import-assertions: 1.9.0(acorn@8.11.3) - browserslist: 4.22.2 - chrome-trace-event: 1.0.3 - enhanced-resolve: 5.15.0 - es-module-lexer: 1.4.1 + '@types/estree': 1.0.6 + '@webassemblyjs/ast': 1.14.1 + '@webassemblyjs/wasm-edit': 1.14.1 + '@webassemblyjs/wasm-parser': 1.14.1 + acorn: 8.14.0 + acorn-import-attributes: 1.9.5(acorn@8.14.0) + browserslist: 4.24.2 + chrome-trace-event: 1.0.4 + enhanced-resolve: 5.17.1 + es-module-lexer: 1.5.4 eslint-scope: 5.1.1 events: 3.3.0 glob-to-regexp: 0.4.1 @@ -21506,9 +21612,9 @@ packages: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.10(webpack@5.89.0) - watchpack: 2.4.0 - webpack-cli: 4.10.0(webpack-dev-server@4.15.1)(webpack@5.89.0) + terser-webpack-plugin: 5.3.10(webpack@5.94.0) + watchpack: 2.4.2 + webpack-cli: 4.10.0(webpack-dev-server@4.15.1)(webpack@5.94.0) webpack-sources: 3.2.3 transitivePeerDependencies: - '@swc/core' @@ -21862,7 +21968,7 @@ packages: engines: {node: '>=10'} dependencies: cliui: 7.0.4 - escalade: 3.1.1 + escalade: 3.2.0 get-caller-file: 2.0.5 require-directory: 2.1.1 string-width: 4.2.3 From 47b91821e7569388c2b2f15ca481dba9e4d8f1d8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 08:19:43 +0100 Subject: [PATCH 015/121] Update dependency class-validator to ^0.14.0 [SECURITY] (#128) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- packages/api/package.json | 2 +- pnpm-lock.yaml | 92 +++++++++++++++++++++++++-------------- 3 files changed, 62 insertions(+), 34 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index a1a6ca55..0e04274b 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -75,7 +75,7 @@ "apollo-server-express": "^3.3.0", "async": "^3.2.0", "class-transformer": "^0.5.0", - "class-validator": "^0.13.1", + "class-validator": "^0.14.0", "cli-progress": "^3.9.0", "commander": "^7.2.0", "compression": "^1.7.4", diff --git a/packages/api/package.json b/packages/api/package.json index 7bdca748..c50199ba 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -57,7 +57,7 @@ "@types/uuid": "^8.3.0", "chokidar-cli": "^2.0.0", "class-transformer": "^0.5.0", - "class-validator": "^0.13.1", + "class-validator": "^0.14.0", "eslint": "^8.0.0", "express": "^4.17.1", "graphql": "^15.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2b9f35fe..0f81c581 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -313,7 +313,7 @@ importers: 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) '@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) + version: 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/config': specifier: ^2.0.0 version: 2.3.4(@nestjs/common@9.4.3)(reflect-metadata@0.1.14)(rxjs@7.8.1) @@ -322,7 +322,7 @@ importers: version: 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': specifier: ^10.0.0 - version: 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) + version: 10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(graphql@15.8.0)(reflect-metadata@0.1.14) '@nestjs/passport': specifier: ^9.0.0 version: 9.0.3(@nestjs/common@9.4.3)(passport@0.4.1) @@ -354,8 +354,8 @@ importers: specifier: ^0.5.0 version: 0.5.1 class-validator: - specifier: ^0.13.1 - version: 0.13.2 + specifier: ^0.14.0 + version: 0.14.1 cli-progress: specifier: ^3.9.0 version: 3.12.0 @@ -969,13 +969,13 @@ importers: 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) + version: 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/core': specifier: ^9.0.0 version: 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': specifier: ^10.0.0 - version: 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) + version: 10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(graphql@15.8.0)(reflect-metadata@0.1.14) '@nestjs/platform-express': specifier: ^9.0.0 version: 9.4.3(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) @@ -1007,8 +1007,8 @@ importers: specifier: ^0.5.0 version: 0.5.1 class-validator: - specifier: ^0.13.1 - version: 0.13.2 + specifier: ^0.14.0 + version: 0.14.1 eslint: specifier: ^8.0.0 version: 8.56.0 @@ -3965,7 +3965,7 @@ packages: peerDependencies: '@nestjs/common': ^9.0.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) + '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) class-transformer: 0.5.1 class-validator: 0.13.2 rimraf: 3.0.2 @@ -4103,9 +4103,9 @@ packages: '@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/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(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) + '@nestjs/graphql': 10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(graphql@15.8.0)(reflect-metadata@0.1.14) '@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) @@ -4806,7 +4806,7 @@ packages: '@nestjs/common': ^9.x '@nestjs/core': ^9.x 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) + '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(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) lodash: 4.17.21 @@ -6342,7 +6342,7 @@ packages: '@nestjs/core': ^8.0.0 || ^9.0.0 || ^10.0.0 dependencies: '@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/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(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.8(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8): @@ -6622,9 +6622,9 @@ packages: apollo-server-fastify: optional: true 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) + '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(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) + '@nestjs/graphql': 10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(graphql@15.8.0)(reflect-metadata@0.1.14) apollo-server-core: 3.13.0(graphql@15.8.0) apollo-server-express: 3.13.0(express@4.20.0)(graphql@15.8.0) graphql: 15.8.0 @@ -6640,7 +6640,7 @@ packages: reflect-metadata: ^0.1.12 rxjs: ^6.0.0 || ^7.0.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) + '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) axios: 1.2.1 reflect-metadata: 0.1.14 rxjs: 7.8.1 @@ -6656,7 +6656,7 @@ packages: cache-manager: <=5 rxjs: ^7.0.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) + '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(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) cache-manager: 5.7.3 rxjs: 7.8.1 @@ -6696,7 +6696,7 @@ packages: - webpack-cli dev: true - /@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/common@9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1): resolution: {integrity: sha512-Gd6D4IaYj01o14Bwv81ukidn4w3bPHCblMUq+SmUmWLyosK+XQmInCS09SbDDZyL8jy86PngtBLTdhJ2bXSUig==} peerDependencies: cache-manager: <=5 @@ -6714,7 +6714,7 @@ packages: dependencies: cache-manager: 5.7.3 class-transformer: 0.5.1 - class-validator: 0.13.2 + class-validator: 0.14.1 iterare: 1.2.1 reflect-metadata: 0.1.14 rxjs: 7.8.1 @@ -6728,7 +6728,7 @@ packages: reflect-metadata: ^0.1.13 rxjs: ^6.0.0 || ^7.2.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) + '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) dotenv: 16.1.4 dotenv-expand: 10.0.0 lodash: 4.17.21 @@ -6755,7 +6755,7 @@ packages: '@nestjs/websockets': optional: true 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) + '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/platform-express': 9.4.3(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) '@nuxtjs/opencollective': 0.3.2 fast-safe-stringify: 2.1.1 @@ -6768,7 +6768,7 @@ packages: transitivePeerDependencies: - encoding - /@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): + /@nestjs/graphql@10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(graphql@15.8.0)(reflect-metadata@0.1.14): resolution: {integrity: sha512-FBzYTymT4oopiGMpej7GTRyhz1BgJxLlXZPUueamC5J9u1WxCwJyETkzBI/zeUkUydlklF/xd5zDd/Md6//hEw==} peerDependencies: '@apollo/subgraph': ^0.1.5 || ^0.3.0 || ^0.4.0 || ^2.0.0 @@ -6792,12 +6792,12 @@ packages: '@graphql-tools/merge': 8.3.18(graphql@15.8.0) '@graphql-tools/schema': 9.0.16(graphql@15.8.0) '@graphql-tools/utils': 9.2.1(graphql@15.8.0) - '@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/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(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/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/mapped-types': 1.2.2(@nestjs/common@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14) chokidar: 3.5.3 class-transformer: 0.5.1 - class-validator: 0.13.2 + class-validator: 0.14.1 fast-glob: 3.2.12 graphql: 15.8.0 graphql-tag: 2.12.6(graphql@15.8.0) @@ -6818,7 +6818,7 @@ packages: peerDependencies: '@nestjs/common': ^8.0.0 || ^9.0.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) + '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@types/jsonwebtoken': 8.5.8 jsonwebtoken: 8.5.1 @@ -6835,18 +6835,36 @@ packages: class-validator: optional: true 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) + '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) class-transformer: 0.5.1 class-validator: 0.13.2 reflect-metadata: 0.1.14 + /@nestjs/mapped-types@1.2.2(@nestjs/common@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14): + resolution: {integrity: sha512-3dHxLXs3M0GPiriAcCFFJQHoDFUuzTD5w6JDhE7TyfT89YKpe6tcCCIqOZWdXmt9AZjjK30RkHRSFF+QEnWFQg==} + peerDependencies: + '@nestjs/common': ^7.0.8 || ^8.0.0 || ^9.0.0 + class-transformer: ^0.2.0 || ^0.3.0 || ^0.4.0 || ^0.5.0 + class-validator: ^0.11.1 || ^0.12.0 || ^0.13.0 || ^0.14.0 + reflect-metadata: ^0.1.12 + peerDependenciesMeta: + class-transformer: + optional: true + class-validator: + optional: true + dependencies: + '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + class-transformer: 0.5.1 + class-validator: 0.14.1 + reflect-metadata: 0.1.14 + /@nestjs/passport@9.0.3(@nestjs/common@9.4.3)(passport@0.4.1): resolution: {integrity: sha512-HplSJaimEAz1IOZEu+pdJHHJhQyBOPAYWXYHfAPQvRqWtw4FJF1VXl1Qtk9dcXQX1eKytDtH+qBzNQc19GWNEg==} peerDependencies: '@nestjs/common': ^8.0.0 || ^9.0.0 passport: ^0.4.0 || ^0.5.0 || ^0.6.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) + '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) passport: 0.4.1 dev: false @@ -6856,7 +6874,7 @@ packages: '@nestjs/common': ^8.0.0 || ^9.0.0 passport: ^0.4.0 || ^0.5.0 || ^0.6.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) + '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) passport: 0.6.0 /@nestjs/platform-express@9.4.3(@nestjs/common@9.4.3)(@nestjs/core@9.4.3): @@ -6865,7 +6883,7 @@ packages: '@nestjs/common': ^9.0.0 '@nestjs/core': ^9.0.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) + '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(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) body-parser: 1.20.2 cors: 2.8.5 @@ -6902,7 +6920,7 @@ packages: '@nestjs/platform-express': optional: true 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) + '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(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/platform-express': 9.4.3(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) tslib: 2.5.3 @@ -9279,6 +9297,9 @@ packages: resolution: {integrity: sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==} dev: true + /@types/validator@13.12.2: + resolution: {integrity: sha512-6SlHBzUW8Jhf3liqrGGXyTJSIFe4nqlJ5A5KaMZ2l/vbM3Wh3KSybots/wfWVzNLK4D1NZluDlSQIbIEPx6oyA==} + /@types/webpack-env@1.18.4: resolution: {integrity: sha512-I6e+9+HtWADAWeeJWDFQtdk4EVSAbj6Rtz4q8fJ7mSr1M0jzlFcs8/HZ+Xb5SHzVm1dxH7aUiI+A8kA8Gcrm0A==} dev: true @@ -11147,6 +11168,13 @@ packages: libphonenumber-js: 1.10.53 validator: 13.11.0 + /class-validator@0.14.1: + resolution: {integrity: sha512-2VEG9JICxIqTpoK1eMzZqaV+u/EiwEJkMGzTrZf6sU/fwsnOITVgYJ8yojSy6CaXtO9V0Cc6ZQZ8h8m4UBuLwQ==} + dependencies: + '@types/validator': 13.12.2 + libphonenumber-js: 1.10.53 + validator: 13.11.0 + /classnames@2.5.1: resolution: {integrity: sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==} @@ -17500,7 +17528,7 @@ packages: '@nestjs/common': ^9 '@nestjs/core': ^9 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) + '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(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) commander: 8.3.0 ora: 5.4.1 From 52e3639998358d0324082cd6599941acda9cb939 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 08:30:15 +0100 Subject: [PATCH 016/121] Update GraphQL Codegen (#137) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 14 +++++++------- demo/campaign/package.json | 10 +++++----- demo/site/package.json | 10 +++++----- packages/admin/package.json | 2 +- pnpm-lock.yaml | 36 ++++++++++++++++++------------------ 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 7969f0fb..41016e3b 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -67,14 +67,14 @@ "@emotion/babel-plugin": "^11.0.0", "@formatjs/cli": "^3.0.1", "@gitbeaker/node": "^35.6.0", - "@graphql-codegen/add": "^3.0.0", - "@graphql-codegen/cli": "^2.0.0", - "@graphql-codegen/fragment-matcher": "^2.0.0", - "@graphql-codegen/introspection": "^2.0.0", - "@graphql-codegen/named-operations-object": "^2.0.0", + "@graphql-codegen/add": "^3.2.3", + "@graphql-codegen/cli": "^2.16.5", + "@graphql-codegen/fragment-matcher": "^2.0.1", + "@graphql-codegen/introspection": "^2.2.3", + "@graphql-codegen/named-operations-object": "^2.3.1", "@graphql-codegen/near-operation-file-preset": "^2.5.0", - "@graphql-codegen/typescript": "^2.0.0", - "@graphql-codegen/typescript-operations": "^2.0.0", + "@graphql-codegen/typescript": "^2.8.8", + "@graphql-codegen/typescript-operations": "^2.5.13", "@types/lodash.isequal": "^4.0.0", "@types/node": "^18.0.0", "@types/react": "^17.0.0", diff --git a/demo/campaign/package.json b/demo/campaign/package.json index 48f8eb13..43544ace 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -52,12 +52,12 @@ "@comet/eslint-config": "^7.5.0", "@formatjs/cli": "^4.2.33", "@gitbeaker/node": "^35.6.0", - "@graphql-codegen/add": "^3.0.0", - "@graphql-codegen/cli": "^2.0.0", - "@graphql-codegen/named-operations-object": "^2.0.0", + "@graphql-codegen/add": "^3.2.3", + "@graphql-codegen/cli": "^2.16.5", + "@graphql-codegen/named-operations-object": "^2.3.1", "@graphql-codegen/near-operation-file-preset": "^2.5.0", - "@graphql-codegen/typescript": "^2.0.0", - "@graphql-codegen/typescript-operations": "^2.0.0", + "@graphql-codegen/typescript": "^2.8.8", + "@graphql-codegen/typescript-operations": "^2.5.13", "@types/draft-js": "^0.11.9", "@types/fs-extra": "^9.0.0", "@types/node": "^18.0.0", diff --git a/demo/site/package.json b/demo/site/package.json index 2f03a350..464575a4 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -53,12 +53,12 @@ "@comet/eslint-config": "^7.5.0", "@formatjs/cli": "^4.2.33", "@gitbeaker/node": "^35.6.0", - "@graphql-codegen/add": "^3.0.0", - "@graphql-codegen/cli": "^2.0.0", - "@graphql-codegen/named-operations-object": "^2.0.0", + "@graphql-codegen/add": "^3.2.3", + "@graphql-codegen/cli": "^2.16.5", + "@graphql-codegen/named-operations-object": "^2.3.1", "@graphql-codegen/near-operation-file-preset": "^2.5.0", - "@graphql-codegen/typescript": "^2.0.0", - "@graphql-codegen/typescript-operations": "^2.0.0", + "@graphql-codegen/typescript": "^2.8.8", + "@graphql-codegen/typescript-operations": "^2.5.13", "@types/draft-js": "^0.11.9", "@types/fs-extra": "^9.0.0", "@types/node": "^18.0.0", diff --git a/packages/admin/package.json b/packages/admin/package.json index 8014a388..59a24617 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -46,7 +46,7 @@ "@comet/eslint-config": "^7.5.0", "@emotion/react": "^11.9.3", "@emotion/styled": "^11.9.3", - "@graphql-codegen/cli": "^2.0.0", + "@graphql-codegen/cli": "^2.16.5", "@mui/icons-material": "^5.8.4", "@mui/material": "^5.8.6", "@mui/system": "^5.8.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0f81c581..9f587d60 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -177,28 +177,28 @@ importers: specifier: ^35.6.0 version: 35.8.1 '@graphql-codegen/add': - specifier: ^3.0.0 + specifier: ^3.2.3 version: 3.2.3(graphql@15.8.0) '@graphql-codegen/cli': - specifier: ^2.0.0 + specifier: ^2.16.5 version: 2.16.5(@babel/core@7.23.7)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5) '@graphql-codegen/fragment-matcher': - specifier: ^2.0.0 + specifier: ^2.0.1 version: 2.0.1(graphql@15.8.0) '@graphql-codegen/introspection': - specifier: ^2.0.0 + specifier: ^2.2.3 version: 2.2.3(graphql@15.8.0) '@graphql-codegen/named-operations-object': - specifier: ^2.0.0 + specifier: ^2.3.1 version: 2.3.1(graphql-tag@2.12.6)(graphql@15.8.0) '@graphql-codegen/near-operation-file-preset': specifier: ^2.5.0 version: 2.5.0(graphql@15.8.0) '@graphql-codegen/typescript': - specifier: ^2.0.0 + specifier: ^2.8.8 version: 2.8.8(graphql@15.8.0) '@graphql-codegen/typescript-operations': - specifier: ^2.0.0 + specifier: ^2.5.13 version: 2.5.13(graphql@15.8.0) '@types/lodash.isequal': specifier: ^4.0.0 @@ -584,22 +584,22 @@ importers: specifier: ^35.6.0 version: 35.8.1 '@graphql-codegen/add': - specifier: ^3.0.0 + specifier: ^3.2.3 version: 3.2.3(graphql@15.8.0) '@graphql-codegen/cli': - specifier: ^2.0.0 + specifier: ^2.16.5 version: 2.16.5(@babel/core@7.23.7)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5) '@graphql-codegen/named-operations-object': - specifier: ^2.0.0 + specifier: ^2.3.1 version: 2.3.1(graphql-tag@2.12.6)(graphql@15.8.0) '@graphql-codegen/near-operation-file-preset': specifier: ^2.5.0 version: 2.5.0(graphql@15.8.0) '@graphql-codegen/typescript': - specifier: ^2.0.0 + specifier: ^2.8.8 version: 2.8.8(graphql@15.8.0) '@graphql-codegen/typescript-operations': - specifier: ^2.0.0 + specifier: ^2.5.13 version: 2.5.13(graphql@15.8.0) '@types/draft-js': specifier: ^0.11.9 @@ -726,22 +726,22 @@ importers: specifier: ^35.6.0 version: 35.8.1 '@graphql-codegen/add': - specifier: ^3.0.0 + specifier: ^3.2.3 version: 3.2.3(graphql@15.8.0) '@graphql-codegen/cli': - specifier: ^2.0.0 + specifier: ^2.16.5 version: 2.16.5(@babel/core@7.23.7)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5) '@graphql-codegen/named-operations-object': - specifier: ^2.0.0 + specifier: ^2.3.1 version: 2.3.1(graphql-tag@2.12.6)(graphql@15.8.0) '@graphql-codegen/near-operation-file-preset': specifier: ^2.5.0 version: 2.5.0(graphql@15.8.0) '@graphql-codegen/typescript': - specifier: ^2.0.0 + specifier: ^2.8.8 version: 2.8.8(graphql@15.8.0) '@graphql-codegen/typescript-operations': - specifier: ^2.0.0 + specifier: ^2.5.13 version: 2.5.13(graphql@15.8.0) '@types/draft-js': specifier: ^0.11.9 @@ -838,7 +838,7 @@ importers: specifier: ^11.9.3 version: 11.11.0(@emotion/react@11.11.3)(@types/react@17.0.75)(react@17.0.2) '@graphql-codegen/cli': - specifier: ^2.0.0 + specifier: ^2.16.5 version: 2.16.5(@babel/core@7.23.7)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5) '@mui/icons-material': specifier: ^5.8.4 From 1fb7a1c5d69ba7dbf1712f5284403ee426698c54 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 08:51:37 +0100 Subject: [PATCH 017/121] Update comet (#134) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Raphael Blum --- .env | 2 + demo/admin/package.json | 16 +- demo/api/block-meta.json | 5 + demo/api/package.json | 6 +- demo/api/schema.gql | 18 +- demo/api/src/app.module.ts | 1 + demo/api/src/config/config.ts | 1 + demo/api/src/config/environment-variables.ts | 4 + demo/campaign/package.json | 6 +- demo/site/package.json | 6 +- package.json | 2 +- packages/admin/package.json | 24 +- packages/api/package.json | 10 +- pnpm-lock.yaml | 790 ++++++++++--------- 14 files changed, 467 insertions(+), 424 deletions(-) diff --git a/.env b/.env index 83ef4fba..c6c6bb05 100644 --- a/.env +++ b/.env @@ -82,3 +82,5 @@ NEXT_PUBLIC_CAMPAIGN_IS_PREVIEW=false REDIRECT_URL_FOR_IMPORT=$SITE_URL BREVO_ALLOWED_REDIRECT_URL=http://${DEV_DOMAIN:-localhost}${WORKAROUND_DOTENV_ISSUE}:${SITE_PORT} CAMPAIGNS_FRONTEND_URL=http://${DEV_DOMAIN:-localhost}${WORKAROUND_DOTENV_ISSUE}:${SITE_PORT} # doesn't work, TODO: add actual mailing frontend + +SITE_PREVIEW_SECRET=8f9d7e6b4c2a1b3c \ No newline at end of file diff --git a/demo/admin/package.json b/demo/admin/package.json index 41016e3b..8117122a 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -25,13 +25,13 @@ "dependencies": { "@apollo/client": "^3.11.8", "@babel/core": "^7.0.0", - "@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/admin": "^7.7.0", + "@comet/admin-icons": "^7.7.0", + "@comet/admin-rte": "^7.7.0", + "@comet/admin-theme": "^7.7.0", + "@comet/blocks-admin": "^7.7.0", "@comet/brevo-admin": "workspace:*", - "@comet/cms-admin": "^7.5.0", + "@comet/cms-admin": "^7.7.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.5.0", - "@comet/eslint-config": "^7.5.0", + "@comet/cli": "^7.7.0", + "@comet/eslint-config": "^7.7.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 bcb79027..c1613026 100644 --- a/demo/api/block-meta.json +++ b/demo/api/block-meta.json @@ -43,6 +43,11 @@ "name": "size", "kind": "Number", "nullable": false + }, + { + "name": "scope", + "kind": "Json", + "nullable": true } ] }, diff --git a/demo/api/package.json b/demo/api/package.json index 0e04274b..00a432a3 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -49,9 +49,9 @@ } }, "dependencies": { - "@comet/blocks-api": "^7.5.0", + "@comet/blocks-api": "^7.7.0", "@comet/brevo-api": "workspace:*", - "@comet/cms-api": "^7.5.0", + "@comet/cms-api": "^7.7.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.5.0", + "@comet/eslint-config": "^7.7.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 5a7e6a7a..1aad3a8b 100644 --- a/demo/api/schema.gql +++ b/demo/api/schema.gql @@ -2,6 +2,14 @@ # THIS FILE WAS AUTOMATICALLY GENERATED (DO NOT MODIFY) # ------------------------------------------------------ +type User { + id: String! + name: String! + email: String! + permissionsCount: Int! + contentScopesCount: Int! +} + type CurrentUserPermission { permission: String! contentScopes: [JSONObject!]! @@ -17,6 +25,8 @@ type CurrentUser { name: String! email: String! permissions: [CurrentUserPermission!]! + impersonated: Boolean + authenticatedUser: User permissionsForScope(scope: JSONObject!): [String!]! } @@ -163,12 +173,6 @@ type FileUpload { imageUrl(resizeWidth: Int!): String } -type User { - id: String! - name: String! - email: String! -} - type PaginatedUserList { nodes: [User!]! totalCount: Int! @@ -528,9 +532,11 @@ type Query { pageTreeNodeList(scope: PageTreeNodeScopeInput!, category: String): [PageTreeNode!]! paginatedPageTreeNodes(scope: PageTreeNodeScopeInput!, category: String, sort: [PageTreeNodeSort!], documentType: String, offset: Int! = 0, limit: Int! = 25): PaginatedPageTreeNodes! pageTreeNodeSlugAvailable(scope: PageTreeNodeScopeInput!, parentId: ID, slug: String!): SlugAvailability! + sitePreviewJwt(scope: JSONObject!, path: String!, includeInvisible: Boolean!): String! 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! redirect(id: ID!): Redirect! + redirectBySource(scope: RedirectScopeInput! = {}, source: String!, sourceType: RedirectSourceTypeValues!): Redirect redirectSourceAvailable(scope: RedirectScopeInput! = {}, source: String!): Boolean! damItemsList(offset: Int! = 0, limit: Int! = 25, sortColumnName: String, sortDirection: SortDirection! = ASC, scope: DamScopeInput! = {}, folderId: ID, includeArchived: Boolean, filter: DamItemFilterInput): PaginatedDamItems! damItemListPosition(sortColumnName: String, sortDirection: SortDirection! = ASC, scope: DamScopeInput! = {}, id: ID!, type: DamItemType!, folderId: ID, includeArchived: Boolean, filter: DamItemFilterInput): Int! diff --git a/demo/api/src/app.module.ts b/demo/api/src/app.module.ts index 33703038..0f0cbf5a 100644 --- a/demo/api/src/app.module.ts +++ b/demo/api/src/app.module.ts @@ -110,6 +110,7 @@ export class AppModule { PageTreeNode: PageTreeNode, Documents: [Page, Link], Scope: PageTreeNodeScope, + sitePreviewSecret: config.sitePreviewSecret, }), RedirectsModule.register(), BlobStorageModule.register({ diff --git a/demo/api/src/config/config.ts b/demo/api/src/config/config.ts index 3eb8c825..3f7efd38 100644 --- a/demo/api/src/config/config.ts +++ b/demo/api/src/config/config.ts @@ -75,6 +75,7 @@ export function createConfig(processEnv: NodeJS.ProcessEnv) { ecgRtrList: { apiKey: envVars.ECG_RTR_LIST_API_KEY, }, + sitePreviewSecret: envVars.SITE_PREVIEW_SECRET, }; } diff --git a/demo/api/src/config/environment-variables.ts b/demo/api/src/config/environment-variables.ts index b094b38f..970415ea 100644 --- a/demo/api/src/config/environment-variables.ts +++ b/demo/api/src/config/environment-variables.ts @@ -142,4 +142,8 @@ export class EnvironmentVariables { @IsString() CAMPAIGN_BASIC_AUTH_PASSWORD: string; + + @IsString() + @MinLength(16) + SITE_PREVIEW_SECRET: string; } diff --git a/demo/campaign/package.json b/demo/campaign/package.json index 43544ace..f13744a1 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.5.0", + "@comet/cms-site": "^7.7.0", "@faire/mjml-react": "^3.4.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.5.0", - "@comet/eslint-config": "^7.5.0", + "@comet/cli": "^7.7.0", + "@comet/eslint-config": "^7.7.0", "@formatjs/cli": "^4.2.33", "@gitbeaker/node": "^35.6.0", "@graphql-codegen/add": "^3.2.3", diff --git a/demo/site/package.json b/demo/site/package.json index 464575a4..6e1fc04e 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.5.0", + "@comet/cms-site": "^7.7.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.5.0", - "@comet/eslint-config": "^7.5.0", + "@comet/cli": "^7.7.0", + "@comet/eslint-config": "^7.7.0", "@formatjs/cli": "^4.2.33", "@gitbeaker/node": "^35.6.0", "@graphql-codegen/add": "^3.2.3", diff --git a/package.json b/package.json index 42974c27..c33c73ac 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "publish": "pnpm run build:lib && $npm_execpath changeset publish" }, "devDependencies": { - "@comet/dev-process-manager": "^2.0.0", + "@comet/dev-process-manager": "^2.6.1", "@changesets/cli": "^2.27.1", "@formatjs/cli": "^4.8.3", "@types/node": "^18.0.0", diff --git a/packages/admin/package.json b/packages/admin/package.json index 59a24617..7650c185 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -37,13 +37,13 @@ "@apollo/client": "^3.11.8", "@babel/cli": "^7.17.6", "@babel/core": "^7.20.12", - "@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", + "@comet/admin": "^7.7.0", + "@comet/admin-babel-preset": "^7.7.0", + "@comet/admin-date-time": "^7.7.0", + "@comet/admin-icons": "^7.7.0", + "@comet/blocks-admin": "^7.7.0", + "@comet/cms-admin": "^7.7.0", + "@comet/eslint-config": "^7.7.0", "@emotion/react": "^11.9.3", "@emotion/styled": "^11.9.3", "@graphql-codegen/cli": "^2.16.5", @@ -75,11 +75,11 @@ }, "peerDependencies": { "@apollo/client": "^3.2.5", - "@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", + "@comet/admin": "^7.7.0", + "@comet/admin-date-time": "^7.7.0", + "@comet/admin-icons": "^7.7.0", + "@comet/blocks-admin": "^7.7.0", + "@comet/cms-admin": "^7.7.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 c50199ba..11a4f739 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -35,9 +35,9 @@ "node-fetch": "^2.6.1" }, "devDependencies": { - "@comet/blocks-api": "^7.5.0", - "@comet/cms-api": "^7.5.0", - "@comet/eslint-config": "^7.5.0", + "@comet/blocks-api": "^7.7.0", + "@comet/cms-api": "^7.7.0", + "@comet/eslint-config": "^7.7.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.5.0", - "@comet/cms-api": "^7.5.0", + "@comet/blocks-api": "^7.7.0", + "@comet/cms-api": "^7.7.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 9f587d60..e9b38b33 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,8 +14,8 @@ importers: specifier: ^2.27.1 version: 2.27.1 '@comet/dev-process-manager': - specifier: ^2.0.0 - version: 2.5.1 + specifier: ^2.6.1 + version: 2.6.1 '@formatjs/cli': specifier: ^4.8.3 version: 4.8.4 @@ -56,26 +56,26 @@ importers: specifier: ^7.0.0 version: 7.23.7 '@comet/admin': - specifier: ^7.5.0 - 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) + specifier: ^7.7.0 + version: 7.7.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) + specifier: ^7.7.0 + version: 7.7.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.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) + specifier: ^7.7.0 + version: 7.7.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) + specifier: ^7.7.0 + version: 7.7.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.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) + specifier: ^7.7.0 + version: 7.7.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.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) + specifier: ^7.7.0 + version: 7.7.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) @@ -162,11 +162,11 @@ importers: version: 5.3.4(react@17.0.2) devDependencies: '@comet/cli': - specifier: ^7.5.0 - version: 7.5.0(ts-node@10.9.2) + specifier: ^7.7.0 + version: 7.7.0(ts-node@10.9.2) '@comet/eslint-config': - specifier: ^7.5.0 - version: 7.5.0(eslint@8.56.0)(next@14.2.16)(prettier@2.8.8)(typescript@4.9.5) + specifier: ^7.7.0 + version: 7.7.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 @@ -276,14 +276,14 @@ importers: demo/api: dependencies: '@comet/blocks-api': - specifier: ^7.5.0 - version: 7.5.0(@nestjs/common@9.4.3) + specifier: ^7.7.0 + version: 7.7.0(@nestjs/common@9.4.3) '@comet/brevo-api': specifier: workspace:* version: link:../../packages/api '@comet/cms-api': - 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.20.0)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) + specifier: ^7.7.0 + version: 7.7.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.20.0)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) '@faker-js/faker': specifier: ^8.3.1 version: 8.3.1 @@ -421,8 +421,8 @@ importers: version: 5.94.0(webpack-cli@4.10.0) devDependencies: '@comet/eslint-config': - 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) + specifier: ^7.7.0 + version: 7.7.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 @@ -490,8 +490,8 @@ importers: demo/campaign: dependencies: '@comet/cms-site': - specifier: ^7.5.0 - 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) + specifier: ^7.7.0 + version: 7.7.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) @@ -572,11 +572,11 @@ importers: specifier: ^7.16.0 version: 7.23.7 '@comet/cli': - specifier: ^7.5.0 - version: 7.5.0(ts-node@10.9.2) + specifier: ^7.7.0 + version: 7.7.0(ts-node@10.9.2) '@comet/eslint-config': - specifier: ^7.5.0 - version: 7.5.0(eslint@8.56.0)(next@14.2.16)(prettier@2.8.8)(typescript@4.9.5) + specifier: ^7.7.0 + version: 7.7.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 @@ -647,8 +647,8 @@ importers: demo/site: dependencies: '@comet/cms-site': - specifier: ^7.5.0 - 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) + specifier: ^7.7.0 + version: 7.7.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 @@ -714,11 +714,11 @@ importers: specifier: ^7.16.0 version: 7.23.7 '@comet/cli': - specifier: ^7.5.0 - version: 7.5.0(ts-node@10.9.2) + specifier: ^7.7.0 + version: 7.7.0(ts-node@10.9.2) '@comet/eslint-config': - specifier: ^7.5.0 - version: 7.5.0(eslint@8.56.0)(next@14.2.16)(prettier@2.8.8)(typescript@4.9.5) + specifier: ^7.7.0 + version: 7.7.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 @@ -811,26 +811,26 @@ importers: specifier: ^7.20.12 version: 7.23.7 '@comet/admin': - specifier: ^7.5.0 - 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) + specifier: ^7.7.0 + version: 7.7.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) + specifier: ^7.7.0 + version: 7.7.0(@babel/cli@7.23.4) '@comet/admin-date-time': - specifier: ^7.5.0 - 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) + specifier: ^7.7.0 + version: 7.7.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) + specifier: ^7.7.0 + version: 7.7.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.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) + specifier: ^7.7.0 + version: 7.7.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.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) + specifier: ^7.7.0 + version: 7.7.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.16)(prettier@2.8.8)(typescript@4.9.5) + specifier: ^7.7.0 + version: 7.7.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) @@ -941,14 +941,14 @@ importers: version: 2.7.0 devDependencies: '@comet/blocks-api': - specifier: ^7.5.0 - version: 7.5.0(@nestjs/common@9.4.3) + specifier: ^7.7.0 + version: 7.7.0(@nestjs/common@9.4.3) '@comet/cms-api': - 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.20.0)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) + specifier: ^7.7.0 + version: 7.7.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.20.0)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) '@comet/eslint-config': - 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) + specifier: ^7.7.0 + version: 7.7.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 @@ -1384,34 +1384,34 @@ packages: '@smithy/util-utf8': 2.0.2 tslib: 2.6.2 - /@aws-sdk/client-s3@3.682.0: - resolution: {integrity: sha512-gn8yPhOmExhqRENnR/vKvsbTw9jaRPbfNE8fQ2j91ejXhpj632QDNdobY8TxxPm2UEW2ISAVM55r2/UPl0YP1Q==} + /@aws-sdk/client-s3@3.645.0: + resolution: {integrity: sha512-RjT/mfNv4yr1uv/+aEXgSIxC5EB+yHPSU7hH0KZOZrvZEFASLl0i4FeoHzbMEOH5KdKGAi0uu3zRP3D1y45sKg==} 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.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 + '@aws-sdk/client-sso-oidc': 3.645.0(@aws-sdk/client-sts@3.645.0) + '@aws-sdk/client-sts': 3.645.0 + '@aws-sdk/core': 3.635.0 + '@aws-sdk/credential-provider-node': 3.645.0(@aws-sdk/client-sso-oidc@3.645.0)(@aws-sdk/client-sts@3.645.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.645.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.645.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.10 '@smithy/core': 2.5.1 '@smithy/eventstream-serde-browser': 3.0.11 @@ -1449,26 +1449,26 @@ packages: transitivePeerDependencies: - aws-crt - /@aws-sdk/client-sso-oidc@3.682.0(@aws-sdk/client-sts@3.682.0): - resolution: {integrity: sha512-ZPZ7Y/r/w3nx/xpPzGSqSQsB090Xk5aZZOH+WBhTDn/pBEuim09BYXCLzvvxb7R7NnuoQdrTJiwimdJAhHl7ZQ==} + /@aws-sdk/client-sso-oidc@3.645.0(@aws-sdk/client-sts@3.645.0): + resolution: {integrity: sha512-X9ULtdk3cO+1ysurEkJ1MSnu6U00qodXx+IVual+1jXX4RYY1WmQmfo7uDKf6FFkz7wW1DAqU+GJIBNQr0YH8A==} engines: {node: '>=16.0.0'} peerDependencies: - '@aws-sdk/client-sts': ^3.682.0 + '@aws-sdk/client-sts': ^3.645.0 dependencies: '@aws-crypto/sha256-browser': 5.2.0 '@aws-crypto/sha256-js': 5.2.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 + '@aws-sdk/client-sts': 3.645.0 + '@aws-sdk/core': 3.635.0 + '@aws-sdk/credential-provider-node': 3.645.0(@aws-sdk/client-sso-oidc@3.645.0)(@aws-sdk/client-sts@3.645.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.645.0 + '@aws-sdk/region-config-resolver': 3.614.0 + '@aws-sdk/types': 3.609.0 + '@aws-sdk/util-endpoints': 3.645.0 + '@aws-sdk/util-user-agent-browser': 3.609.0 + '@aws-sdk/util-user-agent-node': 3.614.0 '@smithy/config-resolver': 3.0.10 '@smithy/core': 2.5.1 '@smithy/fetch-http-handler': 3.2.9 @@ -1498,22 +1498,22 @@ packages: transitivePeerDependencies: - aws-crt - /@aws-sdk/client-sso@3.682.0: - resolution: {integrity: sha512-PYH9RFUMYLFl66HSBq4tIx6fHViMLkhJHTYJoJONpBs+Td+NwVJ895AdLtDsBIhMS0YseCbPpuyjUCJgsUrwUw==} + /@aws-sdk/client-sso@3.645.0: + resolution: {integrity: sha512-2rc8TjnsNddOeKQ/pfNN7deNvGLXAeKeYtHtGDAiM2qfTKxd2sNcAsZ+JCDLyshuD4xLM5fpUyR0X8As9EAouQ==} engines: {node: '>=16.0.0'} dependencies: '@aws-crypto/sha256-browser': 5.2.0 '@aws-crypto/sha256-js': 5.2.0 - '@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 + '@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.645.0 + '@aws-sdk/region-config-resolver': 3.614.0 + '@aws-sdk/types': 3.609.0 + '@aws-sdk/util-endpoints': 3.645.0 + '@aws-sdk/util-user-agent-browser': 3.609.0 + '@aws-sdk/util-user-agent-node': 3.614.0 '@smithy/config-resolver': 3.0.10 '@smithy/core': 2.5.1 '@smithy/fetch-http-handler': 3.2.9 @@ -1543,24 +1543,24 @@ packages: transitivePeerDependencies: - aws-crt - /@aws-sdk/client-sts@3.682.0: - resolution: {integrity: sha512-xKuo4HksZ+F8m9DOfx/ZuWNhaPuqZFPwwy0xqcBT6sWH7OAuBjv/fnpOTzyQhpVTWddlf+ECtMAMrxjxuOExGQ==} + /@aws-sdk/client-sts@3.645.0: + resolution: {integrity: sha512-6azXYtvtnAsPf2ShN9vKynIYVcJOpo6IoVmoMAVgNaBJyllP+s/RORzranYZzckqfmrudSxtct4rVapjLWuAMg==} 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.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 + '@aws-sdk/client-sso-oidc': 3.645.0(@aws-sdk/client-sts@3.645.0) + '@aws-sdk/core': 3.635.0 + '@aws-sdk/credential-provider-node': 3.645.0(@aws-sdk/client-sso-oidc@3.645.0)(@aws-sdk/client-sts@3.645.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.645.0 + '@aws-sdk/region-config-resolver': 3.614.0 + '@aws-sdk/types': 3.609.0 + '@aws-sdk/util-endpoints': 3.645.0 + '@aws-sdk/util-user-agent-browser': 3.609.0 + '@aws-sdk/util-user-agent-node': 3.614.0 '@smithy/config-resolver': 3.0.10 '@smithy/core': 2.5.1 '@smithy/fetch-http-handler': 3.2.9 @@ -1590,11 +1590,10 @@ packages: transitivePeerDependencies: - aws-crt - /@aws-sdk/core@3.679.0: - resolution: {integrity: sha512-CS6PWGX8l4v/xyvX8RtXnBisdCa5+URzKd0L6GvHChype9qKUVxO/Gg6N/y43Hvg7MNWJt9FBPNWIxUB+byJwg==} + /@aws-sdk/core@3.635.0: + resolution: {integrity: sha512-i1x/E/sgA+liUE1XJ7rj1dhyXpAKO1UKFUcTTHXok2ARjWTvszHnSXMOsB77aPbmn0fUp1JTx2kHUAZ1LVt5Bg==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.679.0 '@smithy/core': 2.5.1 '@smithy/node-config-provider': 3.1.9 '@smithy/property-provider': 3.1.8 @@ -1606,22 +1605,20 @@ packages: fast-xml-parser: 4.4.1 tslib: 2.6.2 - /@aws-sdk/credential-provider-env@3.679.0: - resolution: {integrity: sha512-EdlTYbzMm3G7VUNAMxr9S1nC1qUNqhKlAxFU8E7cKsAe8Bp29CD5HAs3POc56AVo9GC4yRIS+/mtlZSmrckzUA==} + /@aws-sdk/credential-provider-env@3.620.1: + resolution: {integrity: sha512-ExuILJ2qLW5ZO+rgkNRj0xiAipKT16Rk77buvPP8csR7kkCflT/gXTyzRe/uzIiETTxM7tr8xuO9MP/DQXqkfg==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/core': 3.679.0 - '@aws-sdk/types': 3.679.0 + '@aws-sdk/types': 3.609.0 '@smithy/property-provider': 3.1.8 '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/credential-provider-http@3.679.0: - resolution: {integrity: sha512-ZoKLubW5DqqV1/2a3TSn+9sSKg0T8SsYMt1JeirnuLJF0mCoYFUaWMyvxxKuxPoqvUsaycxKru4GkpJ10ltNBw==} + /@aws-sdk/credential-provider-http@3.635.0: + resolution: {integrity: sha512-iJyRgEjOCQlBMXqtwPLIKYc7Bsc6nqjrZybdMDenPDa+kmLg7xh8LxHsu9088e+2/wtLicE34FsJJIfzu3L82g==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/core': 3.679.0 - '@aws-sdk/types': 3.679.0 + '@aws-sdk/types': 3.609.0 '@smithy/fetch-http-handler': 3.2.9 '@smithy/node-http-handler': 3.2.5 '@smithy/property-provider': 3.1.8 @@ -1631,20 +1628,19 @@ packages: '@smithy/util-stream': 3.2.1 tslib: 2.6.2 - /@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==} + /@aws-sdk/credential-provider-ini@3.645.0(@aws-sdk/client-sso-oidc@3.645.0)(@aws-sdk/client-sts@3.645.0): + resolution: {integrity: sha512-LlZW0qwUwNlTaAIDCNpLbPsyXvS42pRIwF92fgtCQedmdnpN3XRUC6hcwSYI7Xru3GGKp3RnceOvsdOaRJORsw==} engines: {node: '>=16.0.0'} peerDependencies: - '@aws-sdk/client-sts': ^3.682.0 + '@aws-sdk/client-sts': ^3.645.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 + '@aws-sdk/client-sts': 3.645.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.645.0(@aws-sdk/client-sso-oidc@3.645.0) + '@aws-sdk/credential-provider-web-identity': 3.621.0(@aws-sdk/client-sts@3.645.0) + '@aws-sdk/types': 3.609.0 '@smithy/credential-provider-imds': 3.2.5 '@smithy/property-provider': 3.1.8 '@smithy/shared-ini-file-loader': 3.1.9 @@ -1654,17 +1650,17 @@ packages: - '@aws-sdk/client-sso-oidc' - aws-crt - /@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==} + /@aws-sdk/credential-provider-node@3.645.0(@aws-sdk/client-sso-oidc@3.645.0)(@aws-sdk/client-sts@3.645.0): + resolution: {integrity: sha512-eGFFuNvLeXjCJf5OCIuSEflxUowmK+bCS+lK4M8ofsYOEGAivdx7C0UPxNjHpvM8wKd8vpMl5phTeS9BWX5jMQ==} engines: {node: '>=16.0.0'} dependencies: - '@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 + '@aws-sdk/credential-provider-env': 3.620.1 + '@aws-sdk/credential-provider-http': 3.635.0 + '@aws-sdk/credential-provider-ini': 3.645.0(@aws-sdk/client-sso-oidc@3.645.0)(@aws-sdk/client-sts@3.645.0) + '@aws-sdk/credential-provider-process': 3.620.1 + '@aws-sdk/credential-provider-sso': 3.645.0(@aws-sdk/client-sso-oidc@3.645.0) + '@aws-sdk/credential-provider-web-identity': 3.621.0(@aws-sdk/client-sts@3.645.0) + '@aws-sdk/types': 3.609.0 '@smithy/credential-provider-imds': 3.2.5 '@smithy/property-provider': 3.1.8 '@smithy/shared-ini-file-loader': 3.1.9 @@ -1675,25 +1671,23 @@ packages: - '@aws-sdk/client-sts' - aws-crt - /@aws-sdk/credential-provider-process@3.679.0: - resolution: {integrity: sha512-u/p4TV8kQ0zJWDdZD4+vdQFTMhkDEJFws040Gm113VHa/Xo1SYOjbpvqeuFoz6VmM0bLvoOWjxB9MxnSQbwKpQ==} + /@aws-sdk/credential-provider-process@3.620.1: + resolution: {integrity: sha512-hWqFMidqLAkaV9G460+1at6qa9vySbjQKKc04p59OT7lZ5cO5VH5S4aI05e+m4j364MBROjjk2ugNvfNf/8ILg==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/core': 3.679.0 - '@aws-sdk/types': 3.679.0 + '@aws-sdk/types': 3.609.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.682.0(@aws-sdk/client-sso-oidc@3.682.0): - resolution: {integrity: sha512-h7IH1VsWgV6YAJSWWV6y8uaRjGqLY3iBpGZlXuTH/c236NMLaNv+WqCBLeBxkFGUb2WeQ+FUPEJDCD69rgLIkg==} + /@aws-sdk/credential-provider-sso@3.645.0(@aws-sdk/client-sso-oidc@3.645.0): + resolution: {integrity: sha512-d6XuChAl5NCsCrUexc6AFb4efPmb9+66iwPylKG+iMTMYgO1ackfy1Q2/f35jdn0jolkPkzKsVyfzsEVoID6ew==} engines: {node: '>=16.0.0'} dependencies: - '@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 + '@aws-sdk/client-sso': 3.645.0 + '@aws-sdk/token-providers': 3.614.0(@aws-sdk/client-sso-oidc@3.645.0) + '@aws-sdk/types': 3.609.0 '@smithy/property-provider': 3.1.8 '@smithy/shared-ini-file-loader': 3.1.9 '@smithy/types': 3.6.0 @@ -1702,97 +1696,93 @@ packages: - '@aws-sdk/client-sso-oidc' - aws-crt - /@aws-sdk/credential-provider-web-identity@3.679.0(@aws-sdk/client-sts@3.682.0): - resolution: {integrity: sha512-a74tLccVznXCaBefWPSysUcLXYJiSkeUmQGtalNgJ1vGkE36W5l/8czFiiowdWdKWz7+x6xf0w+Kjkjlj42Ung==} + /@aws-sdk/credential-provider-web-identity@3.621.0(@aws-sdk/client-sts@3.645.0): + resolution: {integrity: sha512-w7ASSyfNvcx7+bYGep3VBgC3K6vEdLmlpjT7nSIHxxQf+WSdvy+HynwJosrpZax0sK5q0D1Jpn/5q+r5lwwW6w==} engines: {node: '>=16.0.0'} peerDependencies: - '@aws-sdk/client-sts': ^3.679.0 + '@aws-sdk/client-sts': ^3.621.0 dependencies: - '@aws-sdk/client-sts': 3.682.0 - '@aws-sdk/core': 3.679.0 - '@aws-sdk/types': 3.679.0 + '@aws-sdk/client-sts': 3.645.0 + '@aws-sdk/types': 3.609.0 '@smithy/property-provider': 3.1.8 '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/middleware-bucket-endpoint@3.679.0: - resolution: {integrity: sha512-5EpiPhhGgnF+uJR4DzWUk6Lx3pOn9oM6JGXxeHsiynfoBfq7vHMleq+uABHHSQS+y7XzbyZ7x8tXNQlliMwOsg==} + /@aws-sdk/middleware-bucket-endpoint@3.620.0: + resolution: {integrity: sha512-eGLL0W6L3HDb3OACyetZYOWpHJ+gLo0TehQKeQyy2G8vTYXqNTeqYhuI6up9HVjBzU9eQiULVQETmgQs7TFaRg==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.679.0 - '@aws-sdk/util-arn-parser': 3.679.0 + '@aws-sdk/types': 3.609.0 + '@aws-sdk/util-arn-parser': 3.568.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.679.0: - resolution: {integrity: sha512-nYsh9PdWrF4EahTRdXHGlNud82RPc508CNGdh1lAGfPU3tNveGfMBX3PcGBtPOse3p9ebNKRWVmUc9eXSjGvHA==} + /@aws-sdk/middleware-expect-continue@3.620.0: + resolution: {integrity: sha512-QXeRFMLfyQ31nAHLbiTLtk0oHzG9QLMaof5jIfqcUwnOkO8YnQdeqzakrg1Alpy/VQ7aqzIi8qypkBe2KXZz0A==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.679.0 + '@aws-sdk/types': 3.609.0 '@smithy/protocol-http': 4.1.5 '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/middleware-flexible-checksums@3.682.0: - resolution: {integrity: sha512-5u1STth6iZUtAvPDO0NJVYKUX2EYKU7v84MYYaZ3O27HphRjFqDos0keL2KTnHn/KmMD68rM3yiUareWR8hnAQ==} + /@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/core': 3.679.0 - '@aws-sdk/types': 3.679.0 + '@aws-sdk/types': 3.609.0 '@smithy/is-array-buffer': 3.0.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.679.0: - resolution: {integrity: sha512-y176HuQ8JRY3hGX8rQzHDSbCl9P5Ny9l16z4xmaiLo+Qfte7ee4Yr3yaAKd7GFoJ3/Mhud2XZ37fR015MfYl2w==} + /@aws-sdk/middleware-host-header@3.620.0: + resolution: {integrity: sha512-VMtPEZwqYrII/oUkffYsNWY9PZ9xpNJpMgmyU0rlDQ25O1c0Hk3fJmZRe6pEkAJ0omD7kLrqGl1DUjQVxpd/Rg==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.679.0 + '@aws-sdk/types': 3.609.0 '@smithy/protocol-http': 4.1.5 '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/middleware-location-constraint@3.679.0: - resolution: {integrity: sha512-SA1C1D3XgoKTGxyNsOqd016ONpk46xJLWDgJUd00Zb21Ox5wYCoY6aDRKiaMRW+1VfCJdezs1Do3XLyIU9KxyA==} + /@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.679.0 + '@aws-sdk/types': 3.609.0 '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/middleware-logger@3.679.0: - resolution: {integrity: sha512-0vet8InEj7nvIvGKk+ch7bEF5SyZ7Us9U7YTEgXPrBNStKeRUsgwRm0ijPWWd0a3oz2okaEwXsFl7G/vI0XiEA==} + /@aws-sdk/middleware-logger@3.609.0: + resolution: {integrity: sha512-S62U2dy4jMDhDFDK5gZ4VxFdWzCtLzwbYyFZx2uvPYTECkepLUfzLic2BHg2Qvtu4QjX+oGE3P/7fwaGIsGNuQ==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.679.0 + '@aws-sdk/types': 3.609.0 '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/middleware-recursion-detection@3.679.0: - resolution: {integrity: sha512-sQoAZFsQiW/LL3DfKMYwBoGjYDEnMbA9WslWN8xneCmBAwKo6IcSksvYs23PP8XMIoBGe2I2J9BSr654XWygTQ==} + /@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.679.0 + '@aws-sdk/types': 3.609.0 '@smithy/protocol-http': 4.1.5 '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/middleware-sdk-s3@3.682.0: - resolution: {integrity: sha512-Tqndx8elRD4xDR8f5Cng6jpZ/odcm1ZTOtGRFMzHgOCij4BeMf4+/+ecQScobcrAZpUTCUTCzaTvdCdJw8MYJA==} + /@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.679.0 - '@aws-sdk/types': 3.679.0 - '@aws-sdk/util-arn-parser': 3.679.0 + '@aws-sdk/core': 3.635.0 + '@aws-sdk/types': 3.609.0 + '@aws-sdk/util-arn-parser': 3.568.0 '@smithy/core': 2.5.1 '@smithy/node-config-provider': 3.1.9 '@smithy/protocol-http': 4.1.5 @@ -1805,61 +1795,66 @@ packages: '@smithy/util-utf8': 3.0.0 tslib: 2.6.2 - /@aws-sdk/middleware-ssec@3.679.0: - resolution: {integrity: sha512-4GNUxXbs1M71uFHRiCAZtN0/g23ogI9YjMe5isAuYMHXwDB3MhqF7usKf954mBP6tplvN44vYlbJ84faaLrTtg==} + /@aws-sdk/middleware-ssec@3.609.0: + resolution: {integrity: sha512-GZSD1s7+JswWOTamVap79QiDaIV7byJFssBW68GYjyRS5EBjNfwA/8s+6uE6g39R3ojyTbYOmvcANoZEhSULXg==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.679.0 + '@aws-sdk/types': 3.609.0 '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/middleware-user-agent@3.682.0: - resolution: {integrity: sha512-7TyvYR9HdGH1/Nq0eeApUTM4izB6rExiw87khVYuJwZHr6FmvIL1FsOVFro/4WlXa0lg4LiYOm/8H8dHv+fXTg==} + /@aws-sdk/middleware-user-agent@3.645.0: + resolution: {integrity: sha512-NpTAtqWK+49lRuxfz7st9for80r4NriCMK0RfdJSoPFVntjsSQiQ7+2nW2XL05uVY633e9DvCAw8YatX3zd1mw==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/core': 3.679.0 - '@aws-sdk/types': 3.679.0 - '@aws-sdk/util-endpoints': 3.679.0 - '@smithy/core': 2.5.1 + '@aws-sdk/types': 3.609.0 + '@aws-sdk/util-endpoints': 3.645.0 '@smithy/protocol-http': 4.1.5 '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/region-config-resolver@3.679.0: - resolution: {integrity: sha512-Ybx54P8Tg6KKq5ck7uwdjiKif7n/8g1x+V0V9uTjBjRWqaIgiqzXwKWoPj6NCNkE7tJNtqI4JrNxp/3S3HvmRw==} + /@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.679.0 + '@aws-sdk/types': 3.609.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.8 tslib: 2.6.2 - /@aws-sdk/signature-v4-multi-region@3.682.0: - resolution: {integrity: sha512-y7RAQSCb9pH8wCX5We9UXfiqPVwBLLvSljhuXC31mibHmYaZnpNEwHiQlRNQPblyaNpiKnXXQ0H3Ns3FDyDYdQ==} + /@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.682.0 - '@aws-sdk/types': 3.679.0 + '@aws-sdk/middleware-sdk-s3': 3.635.0 + '@aws-sdk/types': 3.609.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.679.0(@aws-sdk/client-sso-oidc@3.682.0): - resolution: {integrity: sha512-1/+Zso/x2jqgutKixYFQEGli0FELTgah6bm7aB+m2FAWH4Hz7+iMUsazg6nSWm714sG9G3h5u42Dmpvi9X6/hA==} + /@aws-sdk/token-providers@3.614.0(@aws-sdk/client-sso-oidc@3.645.0): + resolution: {integrity: sha512-okItqyY6L9IHdxqs+Z116y5/nda7rHxLvROxtAJdLavWTYDydxrZstImNgGWTeVdmc0xX2gJCI77UYUTQWnhRw==} engines: {node: '>=16.0.0'} peerDependencies: - '@aws-sdk/client-sso-oidc': ^3.679.0 + '@aws-sdk/client-sso-oidc': ^3.614.0 dependencies: - '@aws-sdk/client-sso-oidc': 3.682.0(@aws-sdk/client-sts@3.682.0) - '@aws-sdk/types': 3.679.0 + '@aws-sdk/client-sso-oidc': 3.645.0(@aws-sdk/client-sts@3.645.0) + '@aws-sdk/types': 3.609.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==} + engines: {node: '>=16.0.0'} + dependencies: + '@smithy/types': 3.6.0 + tslib: 2.6.2 + /@aws-sdk/types@3.679.0: resolution: {integrity: sha512-NwVq8YvInxQdJ47+zz4fH3BRRLC6lL+WLkvr242PVBbUOLRyK/lkwHlfiKUoeVIMyK5NF+up6TRg71t/8Bny6Q==} engines: {node: '>=16.0.0'} @@ -1867,17 +1862,17 @@ packages: '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/util-arn-parser@3.679.0: - resolution: {integrity: sha512-CwzEbU8R8rq9bqUFryO50RFBlkfufV9UfMArHPWlo+lmsC+NlSluHQALoj6Jkq3zf5ppn1CN0c1DDLrEqdQUXg==} + /@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.679.0: - resolution: {integrity: sha512-YL6s4Y/1zC45OvddvgE139fjeWSKKPgLlnfrvhVL7alNyY9n7beR4uhoDpNrt5mI6sn9qiBF17790o+xLAXjjg==} + /@aws-sdk/util-endpoints@3.645.0: + resolution: {integrity: sha512-Oe+xaU4ic4PB1k3pb5VTC1/MWES13IlgpaQw01bVHGfwP6Yv6zZOxizRzca2Y3E+AyR+nKD7vXtHRY+w3bi4bg==} engines: {node: '>=16.0.0'} dependencies: - '@aws-sdk/types': 3.679.0 + '@aws-sdk/types': 3.609.0 '@smithy/types': 3.6.0 '@smithy/util-endpoints': 2.1.4 tslib: 2.6.2 @@ -1888,16 +1883,16 @@ packages: dependencies: tslib: 2.6.2 - /@aws-sdk/util-user-agent-browser@3.679.0: - resolution: {integrity: sha512-CusSm2bTBG1kFypcsqU8COhnYc6zltobsqs3nRrvYqYaOqtMnuE46K4XTWpnzKgwDejgZGOE+WYyprtAxrPvmQ==} + /@aws-sdk/util-user-agent-browser@3.609.0: + resolution: {integrity: sha512-fojPU+mNahzQ0YHYBsx0ZIhmMA96H+ZIZ665ObU9tl+SGdbLneVZVikGve+NmHTQwHzwkFsZYYnVKAkreJLAtA==} dependencies: - '@aws-sdk/types': 3.679.0 + '@aws-sdk/types': 3.609.0 '@smithy/types': 3.6.0 bowser: 2.11.0 tslib: 2.6.2 - /@aws-sdk/util-user-agent-node@3.682.0: - resolution: {integrity: sha512-so5s+j0gPoTS0HM4HPL+G0ajk0T6cQAg8JXzRgvyiQAxqie+zGCZAV3VuVeMNWMVbzsgZl0pYZaatPFTLG/AxA==} + /@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' @@ -1905,14 +1900,13 @@ packages: aws-crt: optional: true dependencies: - '@aws-sdk/middleware-user-agent': 3.682.0 - '@aws-sdk/types': 3.679.0 + '@aws-sdk/types': 3.609.0 '@smithy/node-config-provider': 3.1.9 '@smithy/types': 3.6.0 tslib: 2.6.2 - /@aws-sdk/xml-builder@3.679.0: - resolution: {integrity: sha512-nPmhVZb39ty5bcQ7mAwtjezBcsBqTYZ9A2D9v/lE92KCLdu5RhSkPH7O71ZqbZx1mUSg9fAOxHPiG79U5VlpLQ==} + /@aws-sdk/xml-builder@3.609.0: + resolution: {integrity: sha512-l9XxNcA4HX98rwCC2/KoiWcmEiRfZe4G+mYwDbCFT87JIMj6GBhLDkAzr/W8KAaA2IDr8Vc6J8fZPgVulxxfMA==} engines: {node: '>=16.0.0'} dependencies: '@smithy/types': 3.6.0 @@ -1923,7 +1917,7 @@ packages: engines: {node: '>=18.0.0'} dependencies: '@azure-rest/core-client': 1.4.0 - '@azure/core-auth': 1.5.0 + '@azure/core-auth': 1.9.0 '@azure/core-rest-pipeline': 1.17.0 '@azure/logger': 1.0.4 tslib: 2.6.2 @@ -1935,10 +1929,10 @@ packages: engines: {node: '>=18.0.0'} dependencies: '@azure/abort-controller': 2.1.2 - '@azure/core-auth': 1.5.0 + '@azure/core-auth': 1.9.0 '@azure/core-rest-pipeline': 1.17.0 '@azure/core-tracing': 1.2.0 - '@azure/core-util': 1.6.1 + '@azure/core-util': 1.11.0 tslib: 2.6.2 transitivePeerDependencies: - supports-color @@ -1955,14 +1949,6 @@ packages: dependencies: tslib: 2.6.2 - /@azure/core-auth@1.5.0: - resolution: {integrity: sha512-udzoBuYG1VBoHVohDTrvKjyzel34zt77Bhp7dQntVGGD0ehVq48owENbBG8fIgkHRNUBQH5k1r0hpoMu5L8+kw==} - engines: {node: '>=14.0.0'} - dependencies: - '@azure/abort-controller': 1.1.0 - '@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'} @@ -1976,10 +1962,10 @@ packages: engines: {node: '>=18.0.0'} dependencies: '@azure/abort-controller': 2.1.2 - '@azure/core-auth': 1.5.0 + '@azure/core-auth': 1.9.0 '@azure/core-rest-pipeline': 1.17.0 '@azure/core-tracing': 1.2.0 - '@azure/core-util': 1.6.1 + '@azure/core-util': 1.11.0 '@azure/logger': 1.0.4 tslib: 2.6.2 transitivePeerDependencies: @@ -2000,7 +1986,7 @@ packages: engines: {node: '>=14.0.0'} dependencies: '@azure/abort-controller': 1.1.0 - '@azure/core-util': 1.6.1 + '@azure/core-util': 1.11.0 '@azure/logger': 1.0.4 tslib: 2.6.2 @@ -2044,13 +2030,6 @@ packages: '@azure/abort-controller': 2.1.2 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-xml@1.4.4: resolution: {integrity: sha512-J4FYAqakGXcbfeZjwjMzjNcpcH4E+JtEBv+xcV1yL0Ydn/6wbQfeFKTCHh9wttAi0lmajHw7yBbHPRG+YHckZQ==} engines: {node: '>=18.0.0'} @@ -2069,10 +2048,10 @@ packages: engines: {node: '>=18.0.0'} dependencies: '@azure-rest/core-client': 1.4.0 - '@azure/core-auth': 1.5.0 + '@azure/core-auth': 1.9.0 '@azure/core-rest-pipeline': 1.17.0 '@azure/core-sse': 2.1.3 - '@azure/core-util': 1.6.1 + '@azure/core-util': 1.11.0 '@azure/logger': 1.0.4 tslib: 2.6.2 transitivePeerDependencies: @@ -2083,14 +2062,14 @@ packages: engines: {node: '>=18.0.0'} dependencies: '@azure/abort-controller': 2.1.2 - '@azure/core-auth': 1.5.0 + '@azure/core-auth': 1.9.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.17.0 '@azure/core-tracing': 1.2.0 - '@azure/core-util': 1.6.1 + '@azure/core-util': 1.11.0 '@azure/core-xml': 1.4.4 '@azure/logger': 1.0.4 events: 3.3.0 @@ -3520,7 +3499,7 @@ packages: '@babel/helper-split-export-declaration': 7.22.6 '@babel/parser': 7.23.6 '@babel/types': 7.23.6 - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -3734,8 +3713,8 @@ packages: dev: true optional: true - /@comet/admin-babel-preset@7.5.0(@babel/cli@7.23.4): - resolution: {integrity: sha512-l4eyqqlZJOt8XSVA67qFglTYlYHuok9lhuPFStKhtebFRw91p6ft5D3uWmZDcjTpsULSOW5jzOy9TfK4VsPiuA==} + /@comet/admin-babel-preset@7.7.0(@babel/cli@7.23.4): + resolution: {integrity: sha512-rap123hBI/Q3Q65S3kMpQw9CJOppoCUwYM7/6CJsvxkFFybpOpOnFgjAudUYKw8FBXiq6bsNqkQhlqhuOO1L0g==} peerDependencies: '@babel/cli': '>= 7' dependencies: @@ -3750,8 +3729,8 @@ packages: - supports-color dev: true - /@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==} + /@comet/admin-date-time@7.7.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-btbHQFz4Suwiur4dn9eXljY+zD/0B2xTeGnECpnixVrCCRqzflmFmPMDSVZjXv4j/npoBTEcKPhgShozvP7myQ==} peerDependencies: '@mui/material': ^5.0.0 react: ^17.0 @@ -3759,8 +3738,8 @@ packages: react-final-form: ^6.5.7 react-intl: ^5.0.0 || ^6.0.0 dependencies: - '@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) + '@comet/admin': 7.7.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.7.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 @@ -3786,8 +3765,8 @@ packages: - react-router - react-router-dom - /@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==} + /@comet/admin-icons@7.7.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2): + resolution: {integrity: sha512-91zniX6PDnesOWe/1E9BpO3XlewqtNcsoDeaPE1IgpkIjlsio/gBBniWgEHTxq7xovMxIi2mlDnTX9+c8VW+cQ==} peerDependencies: '@mui/material': ^5.0.0 react: ^17.0 @@ -3799,8 +3778,8 @@ packages: use-constant: 1.1.1(react@17.0.2) uuid: 9.0.1 - /@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==} + /@comet/admin-rte@7.7.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-ic6Xu/J6YUcz6DgO6J/AKMCxLLjjBS3cteVSuQMKMMkxMiAezoUhGtFUvLd1GH/ST57aE4wwB4pdPVItWTgaig==} peerDependencies: '@mui/material': ^5.0.0 draft-js: ^0.11.4 @@ -3810,8 +3789,8 @@ packages: react-final-form: ^6.3.1 react-intl: ^5.0.0 || ^6.0.0 dependencies: - '@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) + '@comet/admin': 7.7.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.7.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) @@ -3839,14 +3818,14 @@ packages: - react-router - react-router-dom - /@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==} + /@comet/admin-theme@7.7.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-lLnie286ww2eOtKonOKloTR2BvJN9AD7Qk8/HtpaYYJmrlZrvNWSkBJ0VF0EY99mTq8vnz8Rt4oxq8e3otyusw==} peerDependencies: '@mui/material': ^5.0.0 '@mui/system': ^5.0.0 react: ^17.0 dependencies: - '@comet/admin-icons': 7.5.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin-icons': 7.7.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) @@ -3855,8 +3834,8 @@ packages: - '@types/react' - react-dom - /@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==} + /@comet/admin@7.7.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-CXw8EgFjbRaIUdEKdBjbSOHY4GyTxqqe4ZxSyvgwosrpG6t0eD/4sknvSEwQMSPVl3FsJzeuoQkDj8yX0f/YDQ==} peerDependencies: '@apollo/client': ^3.7.0 '@emotion/react': ^11.5.0 @@ -3884,8 +3863,8 @@ packages: optional: true dependencies: '@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) + '@comet/admin-icons': 7.7.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin-theme': 7.7.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) @@ -3918,8 +3897,8 @@ packages: - '@mui/system' - '@types/react' - /@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==} + /@comet/blocks-admin@7.7.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-J2IJccacYuiJSehTEfeV4hKTTQtl8HvPF8+BwFAItxNirTBi5arSb73Gcg3W2bawi1mf0uHtFE39SMK+Kn+58g==} peerDependencies: '@mui/material': ^5.0.0 react: ^16.8.0 || ^17.0.0 @@ -3930,8 +3909,8 @@ packages: react-router: ^5.0.0 react-router-dom: ^5.0.0 dependencies: - '@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) + '@comet/admin': 7.7.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.7.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 @@ -3960,8 +3939,8 @@ packages: - graphql - history - /@comet/blocks-api@7.5.0(@nestjs/common@9.4.3): - resolution: {integrity: sha512-GSsCfIbSMFYTqzl9f5PGAcz+ne+C3mROlUJTUexMfhscUsr6IaHp2qU9MiMUpilKlxIQl5Ourf9wuMFHnLNeQA==} + /@comet/blocks-api@7.7.0(@nestjs/common@9.4.3): + resolution: {integrity: sha512-wZRVs/8gjvum5dznLrw2iA+/FpPzGO0H3yg5vipNwTokSdAI62WLXB41BopNA7fAx/6FsGHzSeWd/wMQzgI9tg==} peerDependencies: '@nestjs/common': ^9.0.0 dependencies: @@ -3970,8 +3949,8 @@ packages: class-validator: 0.13.2 rimraf: 3.0.2 - /@comet/cli@7.5.0(ts-node@10.9.2): - resolution: {integrity: sha512-WH9yfs4NcjZLLKzKBFGdDiCq2wQzM1xdS+mPFu+8gfHWQcz+i/r/VNUupng8q10ePjpN/j1Wa9G0w645GkoxPg==} + /@comet/cli@7.7.0(ts-node@10.9.2): + resolution: {integrity: sha512-q29q72cclYIEFpZsFS5uAQHUKHXdN+kJwCVuOnfIgpDSVkEcE4BxsZdL1Kb/OmddiXqAlNhWeEUmXXpHCURXtQ==} hasBin: true peerDependencies: ts-node: ^10.9.1 @@ -3981,8 +3960,8 @@ 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.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==} + /@comet/cms-admin@7.7.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-FARsHyD2+c6ba1yObRG4yosJ7eJPT1Tnx6vLrdriCcsy6T5rGZLr1oJKT5rNKkb/Yw+SbNXrqEvIes+8jpBVHw==} hasBin: true peerDependencies: '@apollo/client': ^3.7.0 @@ -4002,12 +3981,12 @@ packages: react-router-dom: ^5.0.0 dependencies: '@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.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.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': 7.7.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.7.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.7.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin-rte': 7.7.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.7.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.7.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) @@ -4028,12 +4007,13 @@ packages: final-form-set-field-touched: 1.0.1(final-form@4.20.10) graphql: 15.8.0 graphql-tag: 2.12.6(graphql@15.8.0) + js-cookie: 3.0.5 lodash.clonedeep: 4.5.0 lodash.escaperegexp: 4.1.2 lodash.get: 4.4.2 lodash.isequal: 4.5.0 lodash.set: 4.3.2 - mime-db: 1.52.0 + mime-db: 1.53.0 object-path: 0.11.8 p-debounce: 4.0.0 pluralize: 8.0.0 @@ -4043,7 +4023,7 @@ packages: react-dnd: 16.0.1(@types/node@18.19.8)(@types/react@17.0.75)(react@17.0.2) react-dnd-html5-backend: 16.0.1 react-dom: 17.0.2(react@17.0.2) - react-dropzone: 14.2.3(react@17.0.2) + react-dropzone: 14.3.5(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-hotkeys-hook: 3.4.7(react-dom@17.0.2)(react@17.0.2) @@ -4068,8 +4048,8 @@ packages: - draft-js - history - /@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.20.0)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1): - resolution: {integrity: sha512-jol/BP9b98QXR8BuiIdxKKR2Cj5rHvDvV31Fo3d0N3hrUO03IQ5BW/dkAzCQtKLbv6DX9NRjWQ+CtfDOFb/Gcw==} + /@comet/cms-api@7.7.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.20.0)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1): + resolution: {integrity: sha512-Sx92DWQuZmGcYbh147FF+TTW+mO6M115rDez70mEPJFHWaKbjcJGyzxJht048TsBLmnpSL9wBBg31ILKVogl+w==} hasBin: true peerDependencies: '@kubernetes/client-node': '>=0.18.0' @@ -4090,11 +4070,11 @@ packages: '@sentry/node': optional: true dependencies: - '@aws-sdk/client-s3': 3.682.0 + '@aws-sdk/client-s3': 3.645.0 '@azure-rest/ai-translation-text': 1.0.0 '@azure/openai': 1.0.0-beta.11 '@azure/storage-blob': 12.25.0 - '@comet/blocks-api': 7.5.0(@nestjs/common@9.4.3) + '@comet/blocks-api': 7.7.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 @@ -4110,7 +4090,8 @@ packages: '@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 + '@opentelemetry/api': 1.9.0 + '@smithy/node-http-handler': 3.1.4 '@types/get-image-colors': 4.0.5 base64url: 3.0.1 class-transformer: 0.5.1 @@ -4121,7 +4102,7 @@ packages: date-fns: 2.30.0 exifr: 7.1.3 express: 4.20.0 - fast-xml-parser: 4.3.3 + fast-xml-parser: 4.5.0 file-type: 16.5.4 get-image-colors: 4.0.1 got: 11.8.6 @@ -4129,12 +4110,13 @@ packages: graphql-parse-resolve-info: 4.13.0(graphql@15.8.0) graphql-scalars: 1.23.0(graphql@15.8.0) hasha: 5.2.2 + jose: 5.9.6 jsonwebtoken: 8.5.1 jszip: 3.10.1 jwks-rsa: 3.1.0 lodash.isequal: 4.5.0 mime: 3.0.0 - mime-db: 1.52.0 + mime-db: 1.53.0 multer: 1.4.4 nestjs-console: 8.0.0(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) node-fetch: 2.7.0 @@ -4157,8 +4139,8 @@ packages: - encoding - supports-color - /@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==} + /@comet/cms-site@7.7.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-wIdqXU/hLRiuNukO2ad9luhfdZHAcMk4hc/G3V8oqZI+cdEC3gYfw0dUzslb63YhNxqYRcF3/roaRWEZ+GC9Qw==} peerDependencies: '@types/react': ^18.0.0 next: ^14.2.0 @@ -4179,27 +4161,27 @@ packages: usehooks-ts: 3.1.0(react@18.3.1) dev: false - /@comet/dev-process-manager@2.5.1: - resolution: {integrity: sha512-xItAGlckUh3DYIUiTQrp3uNydjLDYMdPKkMlOgkcVkAMtJ4v4J7FGdbZ3m7Y8gBh4pC7jq5JWbUj4B/5ZDR10Q==} + /@comet/dev-process-manager@2.6.1: + resolution: {integrity: sha512-SdjHJolaBWhtqzbxn7FazVqdHsnS6YewAd6vpidSsumyxqVmESXb3/ZKUZh3huavxYKYEQSPCOToYwv+OnBrzQ==} engines: {node: '>=14'} hasBin: true dependencies: - cli-table3: 0.6.3 + cli-table3: 0.6.5 colors: 1.4.0 - commander: 9.5.0 - dotenv: 16.3.1 - dotenv-expand: 10.0.0 + commander: 12.1.0 + dotenv: 16.4.5 + dotenv-expand: 11.0.7 log-update: 4.0.0 pidtree: 0.6.0 pidusage: 3.0.2 pretty-bytes: 5.6.0 - wait-on: 6.0.1 + wait-on: 7.2.0 transitivePeerDependencies: - debug dev: true - /@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==} + /@comet/eslint-config@7.7.0(eslint@8.56.0)(next@14.2.16)(prettier@2.8.8)(typescript@4.9.5): + resolution: {integrity: sha512-Ou7zHQdueJ8mQdwsGvQAYdMvzqnQ6guzZnWR69EFGbO2KN2WTm7EuLmaCvlDjZhfM89k6g1fX5MG12gFzDAIgg==} peerDependencies: eslint: '>= 8' next: '*' @@ -4209,7 +4191,7 @@ packages: optional: true dependencies: '@calm/eslint-plugin-react-intl': 1.4.1 - '@comet/eslint-plugin': 7.5.0(eslint@8.56.0) + '@comet/eslint-plugin': 7.7.0(eslint@8.56.0) '@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) @@ -4236,8 +4218,8 @@ packages: - typescript dev: true - /@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==} + /@comet/eslint-config@7.7.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@27.1.5)(typescript@4.9.5): + resolution: {integrity: sha512-Ou7zHQdueJ8mQdwsGvQAYdMvzqnQ6guzZnWR69EFGbO2KN2WTm7EuLmaCvlDjZhfM89k6g1fX5MG12gFzDAIgg==} peerDependencies: eslint: '>= 8' next: '*' @@ -4247,7 +4229,7 @@ packages: optional: true dependencies: '@calm/eslint-plugin-react-intl': 1.4.1 - '@comet/eslint-plugin': 7.5.0(eslint@8.56.0) + '@comet/eslint-plugin': 7.7.0(eslint@8.56.0) '@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) @@ -4273,8 +4255,8 @@ packages: - typescript dev: true - /@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==} + /@comet/eslint-config@7.7.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@29.1.1)(typescript@4.9.5): + resolution: {integrity: sha512-Ou7zHQdueJ8mQdwsGvQAYdMvzqnQ6guzZnWR69EFGbO2KN2WTm7EuLmaCvlDjZhfM89k6g1fX5MG12gFzDAIgg==} peerDependencies: eslint: '>= 8' next: '*' @@ -4284,7 +4266,7 @@ packages: optional: true dependencies: '@calm/eslint-plugin-react-intl': 1.4.1 - '@comet/eslint-plugin': 7.5.0(eslint@8.56.0) + '@comet/eslint-plugin': 7.7.0(eslint@8.56.0) '@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) @@ -4310,8 +4292,8 @@ packages: - typescript dev: true - /@comet/eslint-plugin@7.5.0(eslint@8.56.0): - resolution: {integrity: sha512-DjlUrCyXSd9OjB9TTSLHFv7eZY8toG4AXQSlCvcl9brLnYJMm2fR+LN5h2oHeYAg6WamkXY1oN0VkZLORh91GQ==} + /@comet/eslint-plugin@7.7.0(eslint@8.56.0): + resolution: {integrity: sha512-4DWcx2ZyTxQzB9uwt0prX+fZKwSZSAeolcPajKtsozpjo5wbMM+HfTWVJWq5d0ODGs6alCWAE5Y/3zpMieUHdQ==} peerDependencies: eslint: '8' dependencies: @@ -4455,7 +4437,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 espree: 9.6.1 globals: 13.24.0 ignore: 5.3.0 @@ -5355,7 +5337,7 @@ packages: graphql-request: 6.1.0(graphql@15.8.0) http-proxy-agent: 6.1.1 https-proxy-agent: 6.2.1 - jose: 4.15.4 + jose: 4.15.9 js-yaml: 4.1.0 json-stable-stringify: 1.1.1 lodash: 4.17.21 @@ -5592,7 +5574,7 @@ packages: engines: {node: '>=10.10.0'} dependencies: '@humanwhocodes/object-schema': 2.0.2 - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -7066,6 +7048,10 @@ packages: resolution: {integrity: sha512-AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw==} engines: {node: '>=8.0.0'} + /@opentelemetry/api@1.9.0: + resolution: {integrity: sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==} + engines: {node: '>=8.0.0'} + /@opentelemetry/auto-instrumentations-node@0.40.3(@opentelemetry/api@1.7.0): resolution: {integrity: sha512-MgBCzpFU4FBQEsXPgt5driYzxErf2JGntQ8Amtc94sqrnvq+FKdEBa6vxOpZlPM+c4Xr6tPpAT1ecTBV8U87hw==} engines: {node: '>=14'} @@ -8379,6 +8365,16 @@ packages: '@smithy/types': 3.6.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.6 + '@smithy/protocol-http': 4.1.5 + '@smithy/querystring-builder': 3.0.8 + '@smithy/types': 3.6.0 + tslib: 2.6.2 + /@smithy/node-http-handler@3.2.5: resolution: {integrity: sha512-PkOwPNeKdvX/jCpn0A8n9/TyoxjGZB8WVoJmm9YzsnAgggTj4CrjpRHlTQw7dlLZ320n1mY1y+nTRUDViKi/3w==} engines: {node: '>=16.0.0'} @@ -9341,7 +9337,7 @@ packages: '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/type-utils': 5.62.0(eslint@8.56.0)(typescript@4.9.5) '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@4.9.5) - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 eslint: 8.56.0 graphemer: 1.4.0 ignore: 5.3.0 @@ -9366,7 +9362,7 @@ packages: '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.9.5) - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 eslint: 8.56.0 typescript: 4.9.5 transitivePeerDependencies: @@ -9401,7 +9397,7 @@ packages: dependencies: '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.9.5) '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@4.9.5) - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 eslint: 8.56.0 tsutils: 3.21.0(typescript@4.9.5) typescript: 4.9.5 @@ -9430,7 +9426,7 @@ packages: dependencies: '@typescript-eslint/types': 5.62.0 '@typescript-eslint/visitor-keys': 5.62.0 - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.4 @@ -10329,6 +10325,10 @@ packages: resolution: {integrity: sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg==} engines: {node: '>=4'} + /attr-accept@2.2.5: + resolution: {integrity: sha512-0bDNnY/u6pPwHDMoF0FieU354oBi0a8rD9FcsLwzcGWbc8KS8KPIi7y+s13OlVY+gMWc/9xEMUgNE6Qm8ZllYQ==} + engines: {node: '>=4'} + /auto-bind@4.0.0: resolution: {integrity: sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==} engines: {node: '>=8'} @@ -10357,23 +10357,25 @@ packages: transitivePeerDependencies: - debug - /axios@0.25.0: - resolution: {integrity: sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==} + /axios@1.2.1: + resolution: {integrity: sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==} dependencies: follow-redirects: 1.15.5 + form-data: 4.0.0 + proxy-from-env: 1.1.0 transitivePeerDependencies: - debug - dev: true + dev: false - /axios@1.2.1: - resolution: {integrity: sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==} + /axios@1.7.7: + resolution: {integrity: sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==} dependencies: - follow-redirects: 1.15.5 + follow-redirects: 1.15.9 form-data: 4.0.0 proxy-from-env: 1.1.0 transitivePeerDependencies: - debug - dev: false + dev: true /axobject-query@3.2.1: resolution: {integrity: sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==} @@ -10908,14 +10910,6 @@ packages: normalize-url: 6.1.0 responselike: 2.0.1 - /call-bind@1.0.5: - resolution: {integrity: sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==} - dependencies: - function-bind: 1.1.2 - get-intrinsic: 1.2.4 - set-function-length: 1.2.2 - dev: true - /call-bind@1.0.7: resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==} engines: {node: '>= 0.4'} @@ -11223,6 +11217,15 @@ packages: '@colors/colors': 1.5.0 dev: true + /cli-table3@0.6.5: + resolution: {integrity: sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==} + engines: {node: 10.* || >= 12.*} + dependencies: + string-width: 4.2.3 + optionalDependencies: + '@colors/colors': 1.5.0 + dev: true + /cli-truncate@2.1.0: resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==} engines: {node: '>=8'} @@ -11380,6 +11383,11 @@ packages: resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==} engines: {node: '>=14'} + /commander@12.1.0: + resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==} + engines: {node: '>=18'} + dev: true + /commander@2.20.3: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} @@ -12168,6 +12176,14 @@ packages: /dotenv-expand@10.0.0: resolution: {integrity: sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==} engines: {node: '>=12'} + dev: false + + /dotenv-expand@11.0.7: + resolution: {integrity: sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==} + engines: {node: '>=12'} + dependencies: + dotenv: 16.4.5 + dev: true /dotenv-expand@8.0.3: resolution: {integrity: sha512-SErOMvge0ZUyWd5B0NXMQlDkN+8r+HhVUsxgOO7IoPDOdDRD2JjExpN6y3KnFR66jsJMwSn1pqIivhU5rcJiNg==} @@ -12183,6 +12199,11 @@ packages: resolution: {integrity: sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==} engines: {node: '>=12'} + /dotenv@16.4.5: + resolution: {integrity: sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==} + engines: {node: '>=12'} + dev: true + /draft-js-export-html@1.4.1(draft-js@0.11.7)(immutable@3.7.6): resolution: {integrity: sha512-G4VGBSalPowktIE4wp3rFbhjs+Ln9IZ2FhXeHjsZDSw0a2+h+BjKu5Enq+mcsyVb51RW740GBK8Xbf7Iic51tw==} peerDependencies: @@ -12490,7 +12511,7 @@ packages: /es-shim-unscopables@1.0.2: resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==} dependencies: - hasown: 2.0.0 + hasown: 2.0.2 dev: true /es-to-primitive@1.2.1: @@ -12595,7 +12616,7 @@ packages: eslint: '*' eslint-plugin-import: '*' dependencies: - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7 enhanced-resolve: 5.15.0 eslint: 8.56.0 eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0) @@ -12705,7 +12726,7 @@ packages: eslint: 8.56.0 eslint-import-resolver-node: 0.3.9 eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0) - hasown: 2.0.0 + hasown: 2.0.2 is-core-module: 2.13.1 is-glob: 4.0.3 minimatch: 3.1.2 @@ -13225,12 +13246,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 @@ -13322,6 +13337,12 @@ packages: dependencies: tslib: 2.6.2 + /file-selector@2.1.0: + resolution: {integrity: sha512-ZuXAqGePcSPz4JuerOY06Dzzq0hrmQ6VGoXVzGyFI1npeOfBgqGIKKpznfYWRkSLJlXutkqVC5WvGZtkFVhu9Q==} + engines: {node: '>= 12'} + dependencies: + tslib: 2.8.1 + /file-type@16.5.4: resolution: {integrity: sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==} engines: {node: '>=10'} @@ -13469,6 +13490,16 @@ packages: debug: optional: true + /follow-redirects@1.15.9: + resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==} + engines: {node: '>=4.0'} + peerDependencies: + debug: '*' + peerDependenciesMeta: + debug: + optional: true + dev: true + /for-each@0.3.3: resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} dependencies: @@ -13836,7 +13867,7 @@ packages: fs.realpath: 1.0.0 minimatch: 8.0.4 minipass: 4.2.8 - path-scurry: 1.10.1 + path-scurry: 1.11.1 dev: true /globals@11.12.0: @@ -14083,13 +14114,6 @@ packages: is-stream: 2.0.1 type-fest: 0.8.1 - /hasown@2.0.0: - resolution: {integrity: sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==} - engines: {node: '>= 0.4'} - dependencies: - function-bind: 1.1.2 - dev: true - /hasown@2.0.2: resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} engines: {node: '>= 0.4'} @@ -14866,7 +14890,7 @@ packages: resolution: {integrity: sha512-v+AgVwiK5DsGtT9ng+m4mClp6zDAmwrW8nZi6Gg15qzvBnRWWdfWA1TGaXyCDnWq5g5asofIgMVl3PjKxvk1ug==} engines: {node: '>=6'} dependencies: - fast-xml-parser: 4.3.3 + fast-xml-parser: 4.5.0 /is-symbol@1.0.4: resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==} @@ -16001,17 +16025,12 @@ packages: '@sideway/formula': 3.0.1 '@sideway/pinpoint': 2.0.0 - /jose@4.15.4: - resolution: {integrity: sha512-W+oqK4H+r5sITxfxpSU+MMdr/YSWGvgZMQDIsNoBDGGy4i7GBPTtvFKibQzW06n3U3TqHjhvBJsirShsEJ6eeQ==} - /jose@4.15.9: resolution: {integrity: sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==} requiresBuild: true - optional: true /jose@5.9.6: resolution: {integrity: sha512-AMlnetc9+CV9asI19zHmrgS/WYsWUwCn2R7RzlbJWD7F9eWYUTGyBmU9o6PxngtLGOiDGPRu+Uc4fhKzbpteZQ==} - dev: false /jpeg-js@0.4.4: resolution: {integrity: sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==} @@ -16031,7 +16050,6 @@ packages: /js-cookie@3.0.5: resolution: {integrity: sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==} engines: {node: '>=14'} - dev: false /js-md5@0.7.3: resolution: {integrity: sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==} @@ -16143,7 +16161,7 @@ packages: resolution: {integrity: sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.5 + call-bind: 1.0.7 isarray: 2.0.5 jsonify: 0.0.1 object-keys: 1.1.1 @@ -16287,7 +16305,7 @@ packages: '@types/express': 4.17.21 '@types/jsonwebtoken': 9.0.5 debug: 4.3.7 - jose: 4.15.4 + jose: 4.15.9 limiter: 1.1.5 lru-memoizer: 2.2.0 transitivePeerDependencies: @@ -18206,14 +18224,6 @@ packages: path-root-regex: 0.1.2 dev: true - /path-scurry@1.10.1: - resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==} - engines: {node: '>=16 || 14 >=14.17'} - dependencies: - lru-cache: 10.2.2 - minipass: 7.0.4 - dev: true - /path-scurry@1.11.1: resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==} engines: {node: '>=16 || 14 >=14.18'} @@ -18624,7 +18634,6 @@ packages: /proxy-from-env@1.1.0: resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} - dev: false /proxyquire@2.1.3: resolution: {integrity: sha512-BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg==} @@ -18856,6 +18865,17 @@ packages: prop-types: 15.8.1 react: 17.0.2 + /react-dropzone@14.3.5(react@17.0.2): + resolution: {integrity: sha512-9nDUaEEpqZLOz5v5SUcFA0CjM4vq8YbqO0WRls+EYT7+DvxUdzDPKNCPLqGfj3YL9MsniCLCD4RFA6M95V6KMQ==} + engines: {node: '>= 10.13'} + peerDependencies: + react: '>= 16.8 || 18.0.0' + dependencies: + attr-accept: 2.2.5 + file-selector: 2.1.0 + prop-types: 15.8.1 + 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): resolution: {integrity: sha512-siVFAolUAe29rMR6u8VwepoysUcUdh6MLV2OWnCtKpsPRUdT9VUgECjAPaVMAH2GROZNiVB9On1H9MMrm9gdpg==} peerDependencies: @@ -19471,6 +19491,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 @@ -20867,6 +20888,9 @@ packages: /tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} + /tslib@2.8.1: + resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} + /tsutils@3.21.0(typescript@4.9.5): resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} @@ -21356,12 +21380,12 @@ packages: xml-name-validator: 3.0.0 dev: true - /wait-on@6.0.1: - resolution: {integrity: sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw==} - engines: {node: '>=10.0.0'} + /wait-on@7.2.0: + resolution: {integrity: sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ==} + engines: {node: '>=12.0.0'} hasBin: true dependencies: - axios: 0.25.0 + axios: 1.7.7 joi: 17.11.1 lodash: 4.17.21 minimist: 1.2.8 From ea954554ae712330c287ee48aaf0f4d3ea541210 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 08:55:32 +0100 Subject: [PATCH 018/121] Update dependency passport to ^0.6.0 [SECURITY] (#130) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- pnpm-lock.yaml | 48 ++++++++++++++----------------------------- 2 files changed, 16 insertions(+), 34 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index 00a432a3..d975a4ed 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -90,7 +90,7 @@ "nestjs-console": "^8.0.0", "node-cache": "^5.1.2", "node-fetch": "^2.6.1", - "passport": "^0.4.0", + "passport": "^0.6.0", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e9b38b33..2fac0ed8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -325,7 +325,7 @@ importers: version: 10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(graphql@15.8.0)(reflect-metadata@0.1.14) '@nestjs/passport': specifier: ^9.0.0 - version: 9.0.3(@nestjs/common@9.4.3)(passport@0.4.1) + version: 9.0.3(@nestjs/common@9.4.3)(passport@0.6.0) '@nestjs/platform-express': specifier: ^9.0.0 version: 9.4.3(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) @@ -399,8 +399,8 @@ importers: specifier: ^2.6.1 version: 2.7.0 passport: - specifier: ^0.4.0 - version: 0.4.1 + specifier: ^0.6.0 + version: 0.6.0 reflect-metadata: specifier: ^0.1.13 version: 0.1.14 @@ -5642,7 +5642,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 22.9.0 + '@types/node': 18.19.8 chalk: 4.1.2 jest-message-util: 29.7.0 jest-util: 29.7.0 @@ -5753,7 +5753,7 @@ packages: dependencies: '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 22.9.0 + '@types/node': 18.19.8 jest-mock: 29.7.0 dev: true @@ -5792,7 +5792,7 @@ packages: dependencies: '@jest/types': 29.6.3 '@sinonjs/fake-timers': 10.3.0 - '@types/node': 22.9.0 + '@types/node': 18.19.8 jest-message-util: 29.7.0 jest-mock: 29.7.0 jest-util: 29.7.0 @@ -5872,7 +5872,7 @@ packages: '@jest/transform': 29.7.0 '@jest/types': 29.6.3 '@jridgewell/trace-mapping': 0.3.25 - '@types/node': 22.9.0 + '@types/node': 18.19.8 chalk: 4.1.2 collect-v8-coverage: 1.0.2 exit: 0.1.2 @@ -6840,16 +6840,6 @@ packages: class-validator: 0.14.1 reflect-metadata: 0.1.14 - /@nestjs/passport@9.0.3(@nestjs/common@9.4.3)(passport@0.4.1): - resolution: {integrity: sha512-HplSJaimEAz1IOZEu+pdJHHJhQyBOPAYWXYHfAPQvRqWtw4FJF1VXl1Qtk9dcXQX1eKytDtH+qBzNQc19GWNEg==} - peerDependencies: - '@nestjs/common': ^8.0.0 || ^9.0.0 - passport: ^0.4.0 || ^0.5.0 || ^0.6.0 - dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) - passport: 0.4.1 - dev: false - /@nestjs/passport@9.0.3(@nestjs/common@9.4.3)(passport@0.6.0): resolution: {integrity: sha512-HplSJaimEAz1IOZEu+pdJHHJhQyBOPAYWXYHfAPQvRqWtw4FJF1VXl1Qtk9dcXQX1eKytDtH+qBzNQc19GWNEg==} peerDependencies: @@ -15126,7 +15116,7 @@ packages: '@jest/expect': 29.7.0 '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 22.9.0 + '@types/node': 18.19.8 chalk: 4.1.2 co: 4.6.0 dedent: 1.5.1 @@ -15421,7 +15411,7 @@ packages: '@jest/environment': 29.7.0 '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 22.9.0 + '@types/node': 18.19.8 jest-mock: 29.7.0 jest-util: 29.7.0 dev: true @@ -15462,7 +15452,7 @@ packages: dependencies: '@jest/types': 29.6.3 '@types/graceful-fs': 4.1.9 - '@types/node': 22.9.0 + '@types/node': 18.19.8 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 @@ -15599,7 +15589,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 22.9.0 + '@types/node': 18.19.8 jest-util: 29.7.0 dev: true @@ -15730,7 +15720,7 @@ packages: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 22.9.0 + '@types/node': 18.19.8 chalk: 4.1.2 emittery: 0.13.1 graceful-fs: 4.2.11 @@ -15791,7 +15781,7 @@ packages: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 22.9.0 + '@types/node': 18.19.8 chalk: 4.1.2 cjs-module-lexer: 1.2.3 collect-v8-coverage: 1.0.2 @@ -15943,7 +15933,7 @@ packages: dependencies: '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 22.9.0 + '@types/node': 18.19.8 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.13.1 @@ -15963,7 +15953,7 @@ packages: resolution: {integrity: sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@types/node': 22.9.0 + '@types/node': 18.19.8 jest-util: 29.7.0 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -18152,14 +18142,6 @@ packages: resolution: {integrity: sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==} engines: {node: '>= 0.4.0'} - /passport@0.4.1: - resolution: {integrity: sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg==} - engines: {node: '>= 0.4.0'} - dependencies: - passport-strategy: 1.0.0 - pause: 0.0.1 - dev: false - /passport@0.6.0: resolution: {integrity: sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==} engines: {node: '>= 0.4.0'} From 231bc6dbe6609d1831388b6c99d7578a89af748c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 09:19:26 +0100 Subject: [PATCH 019/121] Update NestJS (#140) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 20 +- packages/api/package.json | 18 +- pnpm-lock.yaml | 463 +++++++++++++++++++------------------- 3 files changed, 245 insertions(+), 256 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index d975a4ed..f8622936 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -60,13 +60,13 @@ "@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", - "@nestjs/core": "^9.0.0", - "@nestjs/graphql": "^10.0.0", - "@nestjs/passport": "^9.0.0", - "@nestjs/platform-express": "^9.0.0", + "@nestjs/apollo": "^10.2.1", + "@nestjs/common": "^9.4.3", + "@nestjs/config": "^2.3.4", + "@nestjs/core": "^9.4.3", + "@nestjs/graphql": "^10.2.1", + "@nestjs/passport": "^9.0.3", + "@nestjs/platform-express": "^9.4.3", "@opentelemetry/api": "^1.7.0", "@opentelemetry/auto-instrumentations-node": "^0.40.0", "@opentelemetry/exporter-trace-otlp-http": "^0.46.0", @@ -100,9 +100,9 @@ }, "devDependencies": { "@comet/eslint-config": "^7.7.0", - "@nestjs/cli": "^9.0.0", - "@nestjs/schematics": "^9.0.0", - "@nestjs/testing": "^9.0.0", + "@nestjs/cli": "^9.5.0", + "@nestjs/schematics": "^9.2.0", + "@nestjs/testing": "^9.4.3", "@types/async": "^3.2.5", "@types/cli-progress": "^3.8.0", "@types/compression": "^1.7.0", diff --git a/packages/api/package.json b/packages/api/package.json index 11a4f739..716f337e 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -28,8 +28,8 @@ "dependencies": { "@fast-csv/parse": "^5.0.0", "@getbrevo/brevo": "^2.2.0", - "@nestjs/axios": "^1.0.0", - "@nestjs/cache-manager": "^2.2.2", + "@nestjs/axios": "^1.0.1", + "@nestjs/cache-manager": "^2.3.0", "cache-manager": "^5.7.3", "commander": "^7.2.0", "node-fetch": "^2.6.1" @@ -44,10 +44,10 @@ "@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", - "@nestjs/platform-express": "^9.0.0", + "@nestjs/common": "^9.4.3", + "@nestjs/core": "^9.4.3", + "@nestjs/graphql": "^10.2.1", + "@nestjs/platform-express": "^9.4.3", "@types/jest": "^29.5.0", "@types/lodash.isequal": "^4.0.0", "@types/mime-db": "^1.43.5", @@ -82,9 +82,9 @@ "@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/platform-express": "^9.0.0", + "@nestjs/common": "^9.4.3", + "@nestjs/core": "^9.4.3", + "@nestjs/platform-express": "^9.4.3", "reflect-metadata": "^0.1.13", "rxjs": "^7.0.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2fac0ed8..335ac6f8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -309,25 +309,25 @@ importers: 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 + specifier: ^10.2.1 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) '@nestjs/common': - specifier: ^9.0.0 + specifier: ^9.4.3 version: 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/config': - specifier: ^2.0.0 + specifier: ^2.3.4 version: 2.3.4(@nestjs/common@9.4.3)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/core': - specifier: ^9.0.0 + specifier: ^9.4.3 version: 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': - specifier: ^10.0.0 + specifier: ^10.2.1 version: 10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(graphql@15.8.0)(reflect-metadata@0.1.14) '@nestjs/passport': - specifier: ^9.0.0 + specifier: ^9.0.3 version: 9.0.3(@nestjs/common@9.4.3)(passport@0.6.0) '@nestjs/platform-express': - specifier: ^9.0.0 + specifier: ^9.4.3 version: 9.4.3(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) '@opentelemetry/api': specifier: ^1.7.0 @@ -424,13 +424,13 @@ importers: specifier: ^7.7.0 version: 7.7.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@27.1.5)(typescript@4.9.5) '@nestjs/cli': - specifier: ^9.0.0 + specifier: ^9.5.0 version: 9.5.0 '@nestjs/schematics': - specifier: ^9.0.0 + specifier: ^9.2.0 version: 9.2.0(chokidar@3.5.3)(typescript@4.9.5) '@nestjs/testing': - specifier: ^9.0.0 + specifier: ^9.4.3 version: 9.4.3(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/platform-express@9.4.3) '@types/async': specifier: ^3.2.5 @@ -925,11 +925,11 @@ importers: specifier: ^2.2.0 version: 2.2.0 '@nestjs/axios': - specifier: ^1.0.0 + specifier: ^1.0.1 version: 1.0.1(@nestjs/common@9.4.3)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/cache-manager': - specifier: ^2.2.2 - version: 2.2.2(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(cache-manager@5.7.3)(rxjs@7.8.1) + specifier: ^2.3.0 + version: 2.3.0(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(cache-manager@5.7.3)(rxjs@7.8.1) cache-manager: specifier: ^5.7.3 version: 5.7.3 @@ -968,16 +968,16 @@ importers: 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 + specifier: ^9.4.3 version: 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/core': - specifier: ^9.0.0 + specifier: ^9.4.3 version: 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': - specifier: ^10.0.0 + specifier: ^10.2.1 version: 10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(graphql@15.8.0)(reflect-metadata@0.1.14) '@nestjs/platform-express': - specifier: ^9.0.0 + specifier: ^9.4.3 version: 9.4.3(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) '@types/jest': specifier: ^29.5.0 @@ -1334,14 +1334,14 @@ packages: dependencies: '@aws-crypto/util': 5.2.0 '@aws-sdk/types': 3.679.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-crypto/crc32c@5.2.0: resolution: {integrity: sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==} dependencies: '@aws-crypto/util': 5.2.0 '@aws-sdk/types': 3.679.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-crypto/sha1-browser@5.2.0: resolution: {integrity: sha512-OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==} @@ -1351,7 +1351,7 @@ packages: '@aws-sdk/types': 3.679.0 '@aws-sdk/util-locate-window': 3.465.0 '@smithy/util-utf8': 2.0.2 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-crypto/sha256-browser@5.2.0: resolution: {integrity: sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==} @@ -1362,7 +1362,7 @@ packages: '@aws-sdk/types': 3.679.0 '@aws-sdk/util-locate-window': 3.465.0 '@smithy/util-utf8': 2.0.2 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-crypto/sha256-js@5.2.0: resolution: {integrity: sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==} @@ -1370,19 +1370,19 @@ packages: dependencies: '@aws-crypto/util': 5.2.0 '@aws-sdk/types': 3.679.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-crypto/supports-web-crypto@5.2.0: resolution: {integrity: sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@aws-crypto/util@5.2.0: resolution: {integrity: sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==} dependencies: '@aws-sdk/types': 3.679.0 '@smithy/util-utf8': 2.0.2 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/client-s3@3.645.0: resolution: {integrity: sha512-RjT/mfNv4yr1uv/+aEXgSIxC5EB+yHPSU7hH0KZOZrvZEFASLl0i4FeoHzbMEOH5KdKGAi0uu3zRP3D1y45sKg==} @@ -1445,7 +1445,7 @@ packages: '@smithy/util-stream': 3.2.1 '@smithy/util-utf8': 3.0.0 '@smithy/util-waiter': 3.1.7 - tslib: 2.6.2 + tslib: 2.8.1 transitivePeerDependencies: - aws-crt @@ -1494,7 +1494,7 @@ packages: '@smithy/util-middleware': 3.0.8 '@smithy/util-retry': 3.0.8 '@smithy/util-utf8': 3.0.0 - tslib: 2.6.2 + tslib: 2.8.1 transitivePeerDependencies: - aws-crt @@ -1539,7 +1539,7 @@ packages: '@smithy/util-middleware': 3.0.8 '@smithy/util-retry': 3.0.8 '@smithy/util-utf8': 3.0.0 - tslib: 2.6.2 + tslib: 2.8.1 transitivePeerDependencies: - aws-crt @@ -1586,7 +1586,7 @@ packages: '@smithy/util-middleware': 3.0.8 '@smithy/util-retry': 3.0.8 '@smithy/util-utf8': 3.0.0 - tslib: 2.6.2 + tslib: 2.8.1 transitivePeerDependencies: - aws-crt @@ -1603,7 +1603,7 @@ packages: '@smithy/types': 3.6.0 '@smithy/util-middleware': 3.0.8 fast-xml-parser: 4.4.1 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/credential-provider-env@3.620.1: resolution: {integrity: sha512-ExuILJ2qLW5ZO+rgkNRj0xiAipKT16Rk77buvPP8csR7kkCflT/gXTyzRe/uzIiETTxM7tr8xuO9MP/DQXqkfg==} @@ -1612,7 +1612,7 @@ packages: '@aws-sdk/types': 3.609.0 '@smithy/property-provider': 3.1.8 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/credential-provider-http@3.635.0: resolution: {integrity: sha512-iJyRgEjOCQlBMXqtwPLIKYc7Bsc6nqjrZybdMDenPDa+kmLg7xh8LxHsu9088e+2/wtLicE34FsJJIfzu3L82g==} @@ -1626,7 +1626,7 @@ packages: '@smithy/smithy-client': 3.4.2 '@smithy/types': 3.6.0 '@smithy/util-stream': 3.2.1 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/credential-provider-ini@3.645.0(@aws-sdk/client-sso-oidc@3.645.0)(@aws-sdk/client-sts@3.645.0): resolution: {integrity: sha512-LlZW0qwUwNlTaAIDCNpLbPsyXvS42pRIwF92fgtCQedmdnpN3XRUC6hcwSYI7Xru3GGKp3RnceOvsdOaRJORsw==} @@ -1645,7 +1645,7 @@ packages: '@smithy/property-provider': 3.1.8 '@smithy/shared-ini-file-loader': 3.1.9 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 transitivePeerDependencies: - '@aws-sdk/client-sso-oidc' - aws-crt @@ -1665,7 +1665,7 @@ packages: '@smithy/property-provider': 3.1.8 '@smithy/shared-ini-file-loader': 3.1.9 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 transitivePeerDependencies: - '@aws-sdk/client-sso-oidc' - '@aws-sdk/client-sts' @@ -1679,7 +1679,7 @@ packages: '@smithy/property-provider': 3.1.8 '@smithy/shared-ini-file-loader': 3.1.9 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/credential-provider-sso@3.645.0(@aws-sdk/client-sso-oidc@3.645.0): resolution: {integrity: sha512-d6XuChAl5NCsCrUexc6AFb4efPmb9+66iwPylKG+iMTMYgO1ackfy1Q2/f35jdn0jolkPkzKsVyfzsEVoID6ew==} @@ -1691,7 +1691,7 @@ packages: '@smithy/property-provider': 3.1.8 '@smithy/shared-ini-file-loader': 3.1.9 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 transitivePeerDependencies: - '@aws-sdk/client-sso-oidc' - aws-crt @@ -1706,7 +1706,7 @@ packages: '@aws-sdk/types': 3.609.0 '@smithy/property-provider': 3.1.8 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/middleware-bucket-endpoint@3.620.0: resolution: {integrity: sha512-eGLL0W6L3HDb3OACyetZYOWpHJ+gLo0TehQKeQyy2G8vTYXqNTeqYhuI6up9HVjBzU9eQiULVQETmgQs7TFaRg==} @@ -1718,7 +1718,7 @@ packages: '@smithy/protocol-http': 4.1.5 '@smithy/types': 3.6.0 '@smithy/util-config-provider': 3.0.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/middleware-expect-continue@3.620.0: resolution: {integrity: sha512-QXeRFMLfyQ31nAHLbiTLtk0oHzG9QLMaof5jIfqcUwnOkO8YnQdeqzakrg1Alpy/VQ7aqzIi8qypkBe2KXZz0A==} @@ -1727,7 +1727,7 @@ packages: '@aws-sdk/types': 3.609.0 '@smithy/protocol-http': 4.1.5 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/middleware-flexible-checksums@3.620.0: resolution: {integrity: sha512-ftz+NW7qka2sVuwnnO1IzBku5ccP+s5qZGeRTPgrKB7OzRW85gthvIo1vQR2w+OwHFk7WJbbhhWwbCbktnP4UA==} @@ -1740,7 +1740,7 @@ packages: '@smithy/protocol-http': 4.1.5 '@smithy/types': 3.6.0 '@smithy/util-utf8': 3.0.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/middleware-host-header@3.620.0: resolution: {integrity: sha512-VMtPEZwqYrII/oUkffYsNWY9PZ9xpNJpMgmyU0rlDQ25O1c0Hk3fJmZRe6pEkAJ0omD7kLrqGl1DUjQVxpd/Rg==} @@ -1749,7 +1749,7 @@ packages: '@aws-sdk/types': 3.609.0 '@smithy/protocol-http': 4.1.5 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/middleware-location-constraint@3.609.0: resolution: {integrity: sha512-xzsdoTkszGVqGVPjUmgoP7TORiByLueMHieI1fhQL888WPdqctwAx3ES6d/bA9Q/i8jnc6hs+Fjhy8UvBTkE9A==} @@ -1757,7 +1757,7 @@ packages: dependencies: '@aws-sdk/types': 3.609.0 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/middleware-logger@3.609.0: resolution: {integrity: sha512-S62U2dy4jMDhDFDK5gZ4VxFdWzCtLzwbYyFZx2uvPYTECkepLUfzLic2BHg2Qvtu4QjX+oGE3P/7fwaGIsGNuQ==} @@ -1765,7 +1765,7 @@ packages: dependencies: '@aws-sdk/types': 3.609.0 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/middleware-recursion-detection@3.620.0: resolution: {integrity: sha512-nh91S7aGK3e/o1ck64sA/CyoFw+gAYj2BDOnoNa6ouyCrVJED96ZXWbhye/fz9SgmNUZR2g7GdVpiLpMKZoI5w==} @@ -1774,7 +1774,7 @@ packages: '@aws-sdk/types': 3.609.0 '@smithy/protocol-http': 4.1.5 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/middleware-sdk-s3@3.635.0: resolution: {integrity: sha512-RLdYJPEV4JL/7NBoFUs7VlP90X++5FlJdxHz0DzCjmiD3qCviKy+Cym3qg1gBgHwucs5XisuClxDrGokhAdTQw==} @@ -1793,7 +1793,7 @@ packages: '@smithy/util-middleware': 3.0.8 '@smithy/util-stream': 3.2.1 '@smithy/util-utf8': 3.0.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/middleware-ssec@3.609.0: resolution: {integrity: sha512-GZSD1s7+JswWOTamVap79QiDaIV7byJFssBW68GYjyRS5EBjNfwA/8s+6uE6g39R3ojyTbYOmvcANoZEhSULXg==} @@ -1801,7 +1801,7 @@ packages: dependencies: '@aws-sdk/types': 3.609.0 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/middleware-user-agent@3.645.0: resolution: {integrity: sha512-NpTAtqWK+49lRuxfz7st9for80r4NriCMK0RfdJSoPFVntjsSQiQ7+2nW2XL05uVY633e9DvCAw8YatX3zd1mw==} @@ -1811,7 +1811,7 @@ packages: '@aws-sdk/util-endpoints': 3.645.0 '@smithy/protocol-http': 4.1.5 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/region-config-resolver@3.614.0: resolution: {integrity: sha512-vDCeMXvic/LU0KFIUjpC3RiSTIkkvESsEfbVHiHH0YINfl8HnEqR5rj+L8+phsCeVg2+LmYwYxd5NRz4PHxt5g==} @@ -1822,7 +1822,7 @@ packages: '@smithy/types': 3.6.0 '@smithy/util-config-provider': 3.0.0 '@smithy/util-middleware': 3.0.8 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/signature-v4-multi-region@3.635.0: resolution: {integrity: sha512-J6QY4/invOkpogCHjSaDON1hF03viPpOnsrzVuCvJMmclS/iG62R4EY0wq1alYll0YmSdmKlpJwHMWwGtqK63Q==} @@ -1833,7 +1833,7 @@ packages: '@smithy/protocol-http': 4.1.5 '@smithy/signature-v4': 4.2.1 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/token-providers@3.614.0(@aws-sdk/client-sso-oidc@3.645.0): resolution: {integrity: sha512-okItqyY6L9IHdxqs+Z116y5/nda7rHxLvROxtAJdLavWTYDydxrZstImNgGWTeVdmc0xX2gJCI77UYUTQWnhRw==} @@ -1846,27 +1846,27 @@ packages: '@smithy/property-provider': 3.1.8 '@smithy/shared-ini-file-loader': 3.1.9 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/types@3.609.0: resolution: {integrity: sha512-+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==} engines: {node: '>=16.0.0'} dependencies: '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/types@3.679.0: resolution: {integrity: sha512-NwVq8YvInxQdJ47+zz4fH3BRRLC6lL+WLkvr242PVBbUOLRyK/lkwHlfiKUoeVIMyK5NF+up6TRg71t/8Bny6Q==} engines: {node: '>=16.0.0'} dependencies: '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@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 + tslib: 2.8.1 /@aws-sdk/util-endpoints@3.645.0: resolution: {integrity: sha512-Oe+xaU4ic4PB1k3pb5VTC1/MWES13IlgpaQw01bVHGfwP6Yv6zZOxizRzca2Y3E+AyR+nKD7vXtHRY+w3bi4bg==} @@ -1875,13 +1875,13 @@ packages: '@aws-sdk/types': 3.609.0 '@smithy/types': 3.6.0 '@smithy/util-endpoints': 2.1.4 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/util-locate-window@3.465.0: resolution: {integrity: sha512-f+QNcWGswredzC1ExNAB/QzODlxwaTdXkNT5cvke2RLX8SFU5pYk6h4uCtWC0vWPELzOfMfloBrJefBzlarhsw==} engines: {node: '>=14.0.0'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/util-user-agent-browser@3.609.0: resolution: {integrity: sha512-fojPU+mNahzQ0YHYBsx0ZIhmMA96H+ZIZ665ObU9tl+SGdbLneVZVikGve+NmHTQwHzwkFsZYYnVKAkreJLAtA==} @@ -1889,7 +1889,7 @@ packages: '@aws-sdk/types': 3.609.0 '@smithy/types': 3.6.0 bowser: 2.11.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/util-user-agent-node@3.614.0: resolution: {integrity: sha512-15ElZT88peoHnq5TEoEtZwoXTXRxNrk60TZNdpl/TUBJ5oNJ9Dqb5Z4ryb8ofN6nm9aFf59GVAerFDz8iUoHBA==} @@ -1903,14 +1903,14 @@ packages: '@aws-sdk/types': 3.609.0 '@smithy/node-config-provider': 3.1.9 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@aws-sdk/xml-builder@3.609.0: resolution: {integrity: sha512-l9XxNcA4HX98rwCC2/KoiWcmEiRfZe4G+mYwDbCFT87JIMj6GBhLDkAzr/W8KAaA2IDr8Vc6J8fZPgVulxxfMA==} engines: {node: '>=16.0.0'} dependencies: '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@azure-rest/ai-translation-text@1.0.0: resolution: {integrity: sha512-Zt1nwHdvfEzM6EVnx4cLz6GNYS5gxYWbwA3dAr6+NM9CWb3vk+p2Vy/mleU53OSeJvkzhpjXJ78qiJh42JmcXA==} @@ -1920,7 +1920,7 @@ packages: '@azure/core-auth': 1.9.0 '@azure/core-rest-pipeline': 1.17.0 '@azure/logger': 1.0.4 - tslib: 2.6.2 + tslib: 2.8.1 transitivePeerDependencies: - supports-color @@ -1933,7 +1933,7 @@ packages: '@azure/core-rest-pipeline': 1.17.0 '@azure/core-tracing': 1.2.0 '@azure/core-util': 1.11.0 - tslib: 2.6.2 + tslib: 2.8.1 transitivePeerDependencies: - supports-color @@ -1941,13 +1941,13 @@ packages: resolution: {integrity: sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==} engines: {node: '>=12.0.0'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@azure/abort-controller@2.1.2: resolution: {integrity: sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==} engines: {node: '>=18.0.0'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@azure/core-auth@1.9.0: resolution: {integrity: sha512-FPwHpZywuyasDSLMqJ6fhbOK3TqUdviZNF8OqRGA4W5Ewib2lEEZ+pBsYcBa88B2NGO/SEnYPGhyBqNlE8ilSw==} @@ -1955,7 +1955,7 @@ packages: dependencies: '@azure/abort-controller': 2.1.2 '@azure/core-util': 1.11.0 - tslib: 2.6.2 + tslib: 2.8.1 /@azure/core-client@1.9.2: resolution: {integrity: sha512-kRdry/rav3fUKHl/aDLd/pDLcB+4pOFwPPTVEExuMyaI5r+JBbMWqRbCY1pn5BniDaU3lRxO9eaQ1AmSMehl/w==} @@ -1967,7 +1967,7 @@ packages: '@azure/core-tracing': 1.2.0 '@azure/core-util': 1.11.0 '@azure/logger': 1.0.4 - tslib: 2.6.2 + tslib: 2.8.1 transitivePeerDependencies: - supports-color @@ -1988,13 +1988,13 @@ packages: '@azure/abort-controller': 1.1.0 '@azure/core-util': 1.11.0 '@azure/logger': 1.0.4 - tslib: 2.6.2 + tslib: 2.8.1 /@azure/core-paging@1.5.0: resolution: {integrity: sha512-zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw==} engines: {node: '>=14.0.0'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@azure/core-rest-pipeline@1.17.0: resolution: {integrity: sha512-62Vv8nC+uPId3j86XJ0WI+sBf0jlqTqPUFCBNrGtlaUeQUIXWV/D8GE5A1d+Qx8H7OQojn2WguC8kChD6v0shA==} @@ -2007,7 +2007,7 @@ packages: '@azure/logger': 1.0.4 http-proxy-agent: 7.0.2 https-proxy-agent: 7.0.2 - tslib: 2.6.2 + tslib: 2.8.1 transitivePeerDependencies: - supports-color @@ -2015,33 +2015,33 @@ packages: resolution: {integrity: sha512-KSSdIKy8kvWCpYr8Hzpu22j3wcXsVTYE0IlgmI1T/aHvBDsLgV91y90UTfVWnuiuApRLCCVC4gS09ApBGOmYQA==} engines: {node: '>=18.0.0'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@azure/core-tracing@1.2.0: resolution: {integrity: sha512-UKTiEJPkWcESPYJz3X5uKRYyOcJD+4nYph+KpfdPRnQJVrZfk0KJgdnaAWKfhsBBtAf/D58Az4AvCJEmWgIBAg==} engines: {node: '>=18.0.0'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@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 + tslib: 2.8.1 /@azure/core-xml@1.4.4: resolution: {integrity: sha512-J4FYAqakGXcbfeZjwjMzjNcpcH4E+JtEBv+xcV1yL0Ydn/6wbQfeFKTCHh9wttAi0lmajHw7yBbHPRG+YHckZQ==} engines: {node: '>=18.0.0'} dependencies: fast-xml-parser: 4.5.0 - tslib: 2.6.2 + tslib: 2.8.1 /@azure/logger@1.0.4: resolution: {integrity: sha512-ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg==} engines: {node: '>=14.0.0'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@azure/openai@1.0.0-beta.11: resolution: {integrity: sha512-OXS27xkG1abiGf5VZUKnkJKr1VCo8+6EUrTGW5aSVjc5COqX8jAUqVAOZsQVCHBdtWYSBULlZkc0ncKMTRQAiQ==} @@ -2053,7 +2053,7 @@ packages: '@azure/core-sse': 2.1.3 '@azure/core-util': 1.11.0 '@azure/logger': 1.0.4 - tslib: 2.6.2 + tslib: 2.8.1 transitivePeerDependencies: - supports-color @@ -2073,7 +2073,7 @@ packages: '@azure/core-xml': 1.4.4 '@azure/logger': 1.0.4 events: 3.3.0 - tslib: 2.6.2 + tslib: 2.8.1 transitivePeerDependencies: - supports-color @@ -4585,52 +4585,52 @@ packages: resolution: {integrity: sha512-EBikYFp2JCdIfGEb5G9dyCkTGDmC57KSHhRQOC3aYxoPWVZvfWCDjZwkGYHN7Lis/fmuWl906bnNTJifDQ3sXw==} dependencies: '@formatjs/intl-localematcher': 0.2.25 - tslib: 2.6.2 + tslib: 2.8.1 /@formatjs/ecma402-abstract@1.18.2: resolution: {integrity: sha512-+QoPW4csYALsQIl8GbN14igZzDbuwzcpWrku9nyMXlaqAlwRBgl5V+p0vWMGFqHOw37czNXaP/lEk4wbLgcmtA==} dependencies: '@formatjs/intl-localematcher': 0.5.4 - tslib: 2.6.2 + tslib: 2.8.1 dev: true /@formatjs/ecma402-abstract@1.6.3: resolution: {integrity: sha512-7ijswObmYXabVy5GvcpKG29jbyJ9rGtFdRBdmdQvoDmMo0PwlOl/L08GtrjA4YWLAZ0j2owb2YrRLGNAvLBk+Q==} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 dev: true /@formatjs/fast-memoize@1.2.1: resolution: {integrity: sha512-Rg0e76nomkz3vF9IPlKeV+Qynok0r7YZjL6syLz4/urSg0IbjPZCB/iYUMNsYA643gh4mgrX3T7KEIFIxJBQeg==} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@formatjs/icu-messageformat-parser@2.1.0: resolution: {integrity: sha512-Qxv/lmCN6hKpBSss2uQ8IROVnta2r9jd3ymUEIjm2UyIkUCHVcbUVRGL/KS/wv7876edvsPe+hjHVJ4z8YuVaw==} dependencies: '@formatjs/ecma402-abstract': 1.11.4 '@formatjs/icu-skeleton-parser': 1.3.6 - tslib: 2.6.2 + tslib: 2.8.1 /@formatjs/icu-messageformat-parser@2.7.5: resolution: {integrity: sha512-zCB53HdGDibh6/2ISEN3TGsFQruQ6gGKMFV94qHNyVrs0tNO6ncKhV0vq0n3Ydz8ipIQ2GaYAvfCoimNOVvKqA==} dependencies: '@formatjs/ecma402-abstract': 1.18.2 '@formatjs/icu-skeleton-parser': 1.7.2 - tslib: 2.6.2 + tslib: 2.8.1 dev: true /@formatjs/icu-skeleton-parser@1.3.6: resolution: {integrity: sha512-I96mOxvml/YLrwU2Txnd4klA7V8fRhb6JG/4hm3VMNmeJo1F03IpV2L3wWt7EweqNLES59SZ4d6hVOPCSf80Bg==} dependencies: '@formatjs/ecma402-abstract': 1.11.4 - tslib: 2.6.2 + tslib: 2.8.1 /@formatjs/icu-skeleton-parser@1.7.2: resolution: {integrity: sha512-nlIXVv280bjGW3ail5Np1+xgGKBnMhwQQIivgbk9xX0af8ESQO+y2VW9TOY7mCrs3WH786uVpZlLimXAlXH7SA==} dependencies: '@formatjs/ecma402-abstract': 1.18.2 - tslib: 2.6.2 + tslib: 2.8.1 dev: true /@formatjs/intl-displaynames@5.4.3: @@ -4638,24 +4638,24 @@ packages: dependencies: '@formatjs/ecma402-abstract': 1.11.4 '@formatjs/intl-localematcher': 0.2.25 - tslib: 2.6.2 + tslib: 2.8.1 /@formatjs/intl-listformat@6.5.3: resolution: {integrity: sha512-ozpz515F/+3CU+HnLi5DYPsLa6JoCfBggBSSg/8nOB5LYSFW9+ZgNQJxJ8tdhKYeODT+4qVHX27EeJLoxLGLNg==} dependencies: '@formatjs/ecma402-abstract': 1.11.4 '@formatjs/intl-localematcher': 0.2.25 - tslib: 2.6.2 + tslib: 2.8.1 /@formatjs/intl-localematcher@0.2.25: resolution: {integrity: sha512-YmLcX70BxoSopLFdLr1Ds99NdlTI2oWoLbaUW2M406lxOIPzE1KQhRz2fPUkq34xVZQaihCoU29h0KK7An3bhA==} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@formatjs/intl-localematcher@0.5.4: resolution: {integrity: sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 dev: true /@formatjs/intl@2.2.1(typescript@4.9.5): @@ -4672,7 +4672,7 @@ packages: '@formatjs/intl-displaynames': 5.4.3 '@formatjs/intl-listformat': 6.5.3 intl-messageformat: 9.13.0 - tslib: 2.6.2 + tslib: 2.8.1 typescript: 4.9.5 /@formatjs/ts-transformer@3.13.11(ts-jest@27.1.5): @@ -4689,7 +4689,7 @@ packages: chalk: 4.1.2 json-stable-stringify: 1.1.1 ts-jest: 27.1.5(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5) - tslib: 2.6.2 + tslib: 2.8.1 typescript: 5.3.3 dev: true @@ -4707,7 +4707,7 @@ packages: chalk: 4.1.2 json-stable-stringify: 1.1.1 ts-jest: 29.1.1(jest@29.7.0)(typescript@4.9.5) - tslib: 2.6.2 + tslib: 2.8.1 typescript: 5.3.3 dev: true @@ -4720,7 +4720,7 @@ packages: optional: true dependencies: intl-messageformat-parser: 6.4.3 - tslib: 2.6.2 + tslib: 2.8.1 typescript: 4.9.5 dev: true @@ -4735,7 +4735,7 @@ packages: '@formatjs/icu-messageformat-parser': 2.1.0 '@types/node': 14.18.63 chalk: 4.1.2 - tslib: 2.6.2 + tslib: 2.8.1 typescript: 4.9.5 dev: true @@ -5059,7 +5059,7 @@ packages: '@graphql-tools/utils': 9.2.1(graphql@15.8.0) '@whatwg-node/fetch': 0.8.8 graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 transitivePeerDependencies: - encoding dev: true @@ -5072,7 +5072,7 @@ packages: '@graphql-tools/utils': 9.2.1(graphql@15.8.0) dataloader: 2.2.2 graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 value-or-promise: 1.0.12 dev: true @@ -5085,7 +5085,7 @@ packages: '@graphql-tools/utils': 9.2.1(graphql@15.8.0) globby: 11.1.0 graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 unixify: 1.0.0 transitivePeerDependencies: - '@babel/core' @@ -5103,7 +5103,7 @@ packages: '@graphql-tools/utils': 9.2.1(graphql@15.8.0) dataloader: 2.2.2 graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 value-or-promise: 1.0.12 dev: true @@ -5118,7 +5118,7 @@ packages: graphql: 15.8.0 graphql-ws: 5.12.1(graphql@15.8.0) isomorphic-ws: 5.0.0(ws@8.13.0) - tslib: 2.6.2 + tslib: 2.8.1 ws: 8.13.0 transitivePeerDependencies: - bufferutil @@ -5137,7 +5137,7 @@ packages: extract-files: 11.0.0 graphql: 15.8.0 meros: 1.3.0(@types/node@18.19.8) - tslib: 2.6.2 + tslib: 2.8.1 value-or-promise: 1.0.12 transitivePeerDependencies: - '@types/node' @@ -5152,7 +5152,7 @@ packages: '@types/ws': 8.5.10 graphql: 15.8.0 isomorphic-ws: 5.0.0(ws@8.13.0) - tslib: 2.6.2 + tslib: 2.8.1 ws: 8.13.0 transitivePeerDependencies: - bufferutil @@ -5168,7 +5168,7 @@ packages: '@graphql-typed-document-node/core': 3.2.0(graphql@15.8.0) '@repeaterjs/repeater': 3.0.5 graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 value-or-promise: 1.0.12 dev: true @@ -5182,7 +5182,7 @@ packages: graphql: 15.8.0 is-glob: 4.0.3 micromatch: 4.0.5 - tslib: 2.6.2 + tslib: 2.8.1 unixify: 1.0.0 transitivePeerDependencies: - '@babel/core' @@ -5200,7 +5200,7 @@ packages: '@graphql-tools/utils': 9.2.1(graphql@15.8.0) '@whatwg-node/fetch': 0.8.8 graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 value-or-promise: 1.0.12 transitivePeerDependencies: - '@babel/core' @@ -5218,7 +5218,7 @@ packages: '@graphql-tools/utils': 9.2.1(graphql@15.8.0) globby: 11.1.0 graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 unixify: 1.0.0 /@graphql-tools/graphql-tag-pluck@7.5.2(@babel/core@7.23.7)(graphql@15.8.0): @@ -5232,7 +5232,7 @@ packages: '@babel/types': 7.23.6 '@graphql-tools/utils': 9.2.1(graphql@15.8.0) graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 transitivePeerDependencies: - '@babel/core' - supports-color @@ -5246,7 +5246,7 @@ packages: '@graphql-tools/utils': 9.2.1(graphql@15.8.0) graphql: 15.8.0 resolve-from: 5.0.0 - tslib: 2.6.2 + tslib: 2.8.1 /@graphql-tools/json-file-loader@7.4.18(graphql@15.8.0): resolution: {integrity: sha512-AJ1b6Y1wiVgkwsxT5dELXhIVUPs/u3VZ8/0/oOtpcoyO/vAeM5rOvvWegzicOOnQw8G45fgBRMkkRfeuwVt6+w==} @@ -5256,7 +5256,7 @@ packages: '@graphql-tools/utils': 9.2.1(graphql@15.8.0) globby: 11.1.0 graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 unixify: 1.0.0 dev: true @@ -5269,7 +5269,7 @@ packages: '@graphql-tools/utils': 9.2.1(graphql@15.8.0) graphql: 15.8.0 p-limit: 3.1.0 - tslib: 2.6.2 + tslib: 2.8.1 /@graphql-tools/merge@8.3.1(graphql@15.8.0): resolution: {integrity: sha512-BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg==} @@ -5278,7 +5278,7 @@ packages: dependencies: '@graphql-tools/utils': 8.9.0(graphql@15.8.0) graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 dev: false /@graphql-tools/merge@8.3.18(graphql@15.8.0): @@ -5288,7 +5288,7 @@ packages: dependencies: '@graphql-tools/utils': 9.2.1(graphql@15.8.0) graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 /@graphql-tools/merge@8.4.2(graphql@15.8.0): resolution: {integrity: sha512-XbrHAaj8yDuINph+sAfuq3QCZ/tKblrTLOpirK0+CAgNlZUCHs0Fa+xtMUURgwCVThLle1AF7svJCxFizygLsw==} @@ -5297,7 +5297,7 @@ packages: dependencies: '@graphql-tools/utils': 9.2.1(graphql@15.8.0) graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 /@graphql-tools/mock@8.7.20(graphql@15.8.0): resolution: {integrity: sha512-ljcHSJWjC/ZyzpXd5cfNhPI7YljRVvabKHPzKjEs5ElxWu2cdlLGvyNYepApXDsM/OJG/2xuhGM+9GWu5gEAPQ==} @@ -5308,7 +5308,7 @@ packages: '@graphql-tools/utils': 9.2.1(graphql@15.8.0) fast-json-stable-stringify: 2.1.0 graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 dev: false /@graphql-tools/optimize@1.4.0(graphql@15.8.0): @@ -5317,7 +5317,7 @@ packages: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 dev: true /@graphql-tools/prisma-loader@7.2.72(@types/node@18.19.8)(graphql@15.8.0): @@ -5332,7 +5332,7 @@ packages: '@whatwg-node/fetch': 0.8.8 chalk: 4.1.2 debug: 4.3.7 - dotenv: 16.3.1 + dotenv: 16.4.5 graphql: 15.8.0 graphql-request: 6.1.0(graphql@15.8.0) http-proxy-agent: 6.1.1 @@ -5342,7 +5342,7 @@ packages: json-stable-stringify: 1.1.1 lodash: 4.17.21 scuid: 1.1.0 - tslib: 2.6.2 + tslib: 2.8.1 yaml-ast-parser: 0.0.43 transitivePeerDependencies: - '@types/node' @@ -5360,7 +5360,7 @@ packages: '@ardatan/relay-compiler': 12.0.0(graphql@15.8.0) '@graphql-tools/utils': 9.2.1(graphql@15.8.0) graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 transitivePeerDependencies: - encoding - supports-color @@ -5374,7 +5374,7 @@ packages: '@graphql-tools/merge': 8.3.1(graphql@15.8.0) '@graphql-tools/utils': 8.9.0(graphql@15.8.0) graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 value-or-promise: 1.0.11 dev: false @@ -5386,7 +5386,7 @@ packages: '@graphql-tools/merge': 8.3.18(graphql@15.8.0) '@graphql-tools/utils': 9.2.1(graphql@15.8.0) graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 value-or-promise: 1.0.12 /@graphql-tools/schema@9.0.19(graphql@15.8.0): @@ -5397,7 +5397,7 @@ packages: '@graphql-tools/merge': 8.4.2(graphql@15.8.0) '@graphql-tools/utils': 9.2.1(graphql@15.8.0) graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 value-or-promise: 1.0.12 /@graphql-tools/url-loader@7.17.18(@types/node@18.19.8)(graphql@15.8.0): @@ -5416,7 +5416,7 @@ packages: '@whatwg-node/fetch': 0.8.8 graphql: 15.8.0 isomorphic-ws: 5.0.0(ws@8.16.0) - tslib: 2.6.2 + tslib: 2.8.1 value-or-promise: 1.0.12 ws: 8.16.0 transitivePeerDependencies: @@ -5443,7 +5443,7 @@ packages: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 dev: true /@graphql-tools/utils@8.9.0(graphql@15.8.0): @@ -5452,7 +5452,7 @@ packages: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 dev: false /@graphql-tools/utils@9.2.1(graphql@15.8.0): @@ -5462,7 +5462,7 @@ packages: dependencies: '@graphql-typed-document-node/core': 3.2.0(graphql@15.8.0) graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 /@graphql-tools/wrap@9.4.2(graphql@15.8.0): resolution: {integrity: sha512-DFcd9r51lmcEKn0JW43CWkkI2D6T9XI1juW/Yo86i04v43O9w2/k4/nx2XTJv4Yv+iXwUw7Ok81PGltwGJSDSA==} @@ -5473,7 +5473,7 @@ packages: '@graphql-tools/schema': 9.0.19(graphql@15.8.0) '@graphql-tools/utils': 9.2.1(graphql@15.8.0) graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 value-or-promise: 1.0.12 dev: true @@ -6630,8 +6630,8 @@ packages: - debug dev: false - /@nestjs/cache-manager@2.2.2(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(cache-manager@5.7.3)(rxjs@7.8.1): - resolution: {integrity: sha512-+n7rpU1QABeW2WV17Dl1vZCG3vWjJU1MaamWgZvbGxYE9EeCM0lVLfw3z7acgDTNwOy+K68xuQPoIMxD0bhjlA==} + /@nestjs/cache-manager@2.3.0(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(cache-manager@5.7.3)(rxjs@7.8.1): + resolution: {integrity: sha512-pxeBp9w/s99HaW2+pezM1P3fLiWmUEnTUoUMLa9UYViCtjj0E0A19W/vaT5JFACCzFIeNrwH4/16jkpAhQ25Vw==} peerDependencies: '@nestjs/common': ^9.0.0 || ^10.0.0 '@nestjs/core': ^9.0.0 || ^10.0.0 @@ -7990,14 +7990,14 @@ packages: dependencies: asn1js: 3.0.5 pvtsutils: 1.3.5 - tslib: 2.6.2 + tslib: 2.8.1 dev: true /@peculiar/json-schema@1.1.12: resolution: {integrity: sha512-coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w==} engines: {node: '>=8.0.0'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 dev: true /@peculiar/webcrypto@1.4.4: @@ -8007,7 +8007,7 @@ packages: '@peculiar/asn1-schema': 2.3.8 '@peculiar/json-schema': 1.1.12 pvtsutils: 1.3.5 - tslib: 2.6.2 + tslib: 2.8.1 webcrypto-core: 1.7.7 dev: true @@ -8144,18 +8144,18 @@ packages: engines: {node: '>=16.0.0'} dependencies: '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@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 + tslib: 2.8.1 /@smithy/chunked-blob-reader@4.0.0: resolution: {integrity: sha512-jSqRnZvkT4egkq/7b6/QRCNXmmYVcHwnJldqJ3IhVpQE2atObVJ137xmGeuGFhjFUr8gCEVAOKwSY79OvpbDaQ==} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/config-resolver@3.0.10: resolution: {integrity: sha512-Uh0Sz9gdUuz538nvkPiyv1DZRX9+D15EKDtnQP5rYVAzM/dnYk3P8cg73jcxyOitPgT3mE3OVj7ky7sibzHWkw==} @@ -8165,7 +8165,7 @@ packages: '@smithy/types': 3.6.0 '@smithy/util-config-provider': 3.0.0 '@smithy/util-middleware': 3.0.8 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/core@2.5.1: resolution: {integrity: sha512-DujtuDA7BGEKExJ05W5OdxCoyekcKT3Rhg1ZGeiUWaz2BJIWXjZmsG/DIP4W48GHno7AQwRsaCb8NcBgH3QZpg==} @@ -8178,7 +8178,7 @@ packages: '@smithy/util-middleware': 3.0.8 '@smithy/util-stream': 3.2.1 '@smithy/util-utf8': 3.0.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/credential-provider-imds@3.2.5: resolution: {integrity: sha512-4FTQGAsuwqTzVMmiRVTn0RR9GrbRfkP0wfu/tXWVHd2LgNpTY0uglQpIScXK4NaEyXbB3JmZt8gfVqO50lP8wg==} @@ -8188,7 +8188,7 @@ packages: '@smithy/property-provider': 3.1.8 '@smithy/types': 3.6.0 '@smithy/url-parser': 3.0.8 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/eventstream-codec@3.1.7: resolution: {integrity: sha512-kVSXScIiRN7q+s1x7BrQtZ1Aa9hvvP9FeCqCdBxv37GimIHgBCOnZ5Ip80HLt0DhnAKpiobFdGqTFgbaJNrazA==} @@ -8196,7 +8196,7 @@ packages: '@aws-crypto/crc32': 5.2.0 '@smithy/types': 3.6.0 '@smithy/util-hex-encoding': 3.0.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/eventstream-serde-browser@3.0.11: resolution: {integrity: sha512-Pd1Wnq3CQ/v2SxRifDUihvpXzirJYbbtXfEnnLV/z0OGCTx/btVX74P86IgrZkjOydOASBGXdPpupYQI+iO/6A==} @@ -8204,14 +8204,14 @@ packages: dependencies: '@smithy/eventstream-serde-universal': 3.0.10 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/eventstream-serde-config-resolver@3.0.8: resolution: {integrity: sha512-zkFIG2i1BLbfoGQnf1qEeMqX0h5qAznzaZmMVNnvPZz9J5AWBPkOMckZWPedGUPcVITacwIdQXoPcdIQq5FRcg==} engines: {node: '>=16.0.0'} dependencies: '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/eventstream-serde-node@3.0.10: resolution: {integrity: sha512-hjpU1tIsJ9qpcoZq9zGHBJPBOeBGYt+n8vfhDwnITPhEre6APrvqq/y3XMDEGUT2cWQ4ramNqBPRbx3qn55rhw==} @@ -8219,7 +8219,7 @@ packages: dependencies: '@smithy/eventstream-serde-universal': 3.0.10 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/eventstream-serde-universal@3.0.10: resolution: {integrity: sha512-ewG1GHbbqsFZ4asaq40KmxCmXO+AFSM1b+DcO2C03dyJj/ZH71CiTg853FSE/3SHK9q3jiYQIFjlGSwfxQ9kww==} @@ -8227,7 +8227,7 @@ packages: dependencies: '@smithy/eventstream-codec': 3.1.7 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/fetch-http-handler@3.2.9: resolution: {integrity: sha512-hYNVQOqhFQ6vOpenifFME546f0GfJn2OiQ3M0FDmuUu8V/Uiwy2wej7ZXxFBNqdx0R5DZAqWM1l6VRhGz8oE6A==} @@ -8236,7 +8236,7 @@ packages: '@smithy/querystring-builder': 3.0.8 '@smithy/types': 3.6.0 '@smithy/util-base64': 3.0.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/fetch-http-handler@4.0.0: resolution: {integrity: sha512-MLb1f5tbBO2X6K4lMEKJvxeLooyg7guq48C2zKr4qM7F2Gpkz4dc+hdSgu77pCJ76jVqFBjZczHYAs6dp15N+g==} @@ -8245,7 +8245,7 @@ packages: '@smithy/querystring-builder': 3.0.8 '@smithy/types': 3.6.0 '@smithy/util-base64': 3.0.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/hash-blob-browser@3.1.7: resolution: {integrity: sha512-4yNlxVNJifPM5ThaA5HKnHkn7JhctFUHvcaz6YXxHlYOSIrzI6VKQPTN8Gs1iN5nqq9iFcwIR9THqchUCouIfg==} @@ -8253,7 +8253,7 @@ packages: '@smithy/chunked-blob-reader': 4.0.0 '@smithy/chunked-blob-reader-native': 3.0.1 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/hash-node@3.0.8: resolution: {integrity: sha512-tlNQYbfpWXHimHqrvgo14DrMAgUBua/cNoz9fMYcDmYej7MAmUcjav/QKQbFc3NrcPxeJ7QClER4tWZmfwoPng==} @@ -8262,7 +8262,7 @@ packages: '@smithy/types': 3.6.0 '@smithy/util-buffer-from': 3.0.0 '@smithy/util-utf8': 3.0.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/hash-stream-node@3.1.7: resolution: {integrity: sha512-xMAsvJ3hLG63lsBVi1Hl6BBSfhd8/Qnp8fC06kjOpJvyyCEXdwHITa5Kvdsk6gaAXLhbZMhQMIGvgUbfnJDP6Q==} @@ -8270,32 +8270,32 @@ packages: dependencies: '@smithy/types': 3.6.0 '@smithy/util-utf8': 3.0.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/invalid-dependency@3.0.8: resolution: {integrity: sha512-7Qynk6NWtTQhnGTTZwks++nJhQ1O54Mzi7fz4PqZOiYXb4Z1Flpb2yRvdALoggTS8xjtohWUM+RygOtB30YL3Q==} dependencies: '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/is-array-buffer@2.0.0: resolution: {integrity: sha512-z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug==} engines: {node: '>=14.0.0'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/is-array-buffer@3.0.0: resolution: {integrity: sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==} engines: {node: '>=16.0.0'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/md5-js@3.0.8: resolution: {integrity: sha512-LwApfTK0OJ/tCyNUXqnWCKoE2b4rDSr4BJlDAVCkiWYeHESr+y+d5zlAanuLW6fnitVJRD/7d9/kN/ZM9Su4mA==} dependencies: '@smithy/types': 3.6.0 '@smithy/util-utf8': 3.0.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/middleware-content-length@3.0.10: resolution: {integrity: sha512-T4dIdCs1d/+/qMpwhJ1DzOhxCZjZHbHazEPJWdB4GDi2HjIZllVzeBEcdJUN0fomV8DURsgOyrbEUzg3vzTaOg==} @@ -8303,7 +8303,7 @@ packages: dependencies: '@smithy/protocol-http': 4.1.5 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/middleware-endpoint@3.2.1: resolution: {integrity: sha512-wWO3xYmFm6WRW8VsEJ5oU6h7aosFXfszlz3Dj176pTij6o21oZnzkCLzShfmRaaCHDkBXWBdO0c4sQAvLFP6zA==} @@ -8316,7 +8316,7 @@ packages: '@smithy/types': 3.6.0 '@smithy/url-parser': 3.0.8 '@smithy/util-middleware': 3.0.8 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/middleware-retry@3.0.25: resolution: {integrity: sha512-m1F70cPaMBML4HiTgCw5I+jFNtjgz5z5UdGnUbG37vw6kh4UvizFYjqJGHvicfgKMkDL6mXwyPp5mhZg02g5sg==} @@ -8329,7 +8329,7 @@ packages: '@smithy/types': 3.6.0 '@smithy/util-middleware': 3.0.8 '@smithy/util-retry': 3.0.8 - tslib: 2.6.2 + tslib: 2.8.1 uuid: 9.0.1 /@smithy/middleware-serde@3.0.8: @@ -8337,14 +8337,14 @@ packages: engines: {node: '>=16.0.0'} dependencies: '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/middleware-stack@3.0.8: resolution: {integrity: sha512-d7ZuwvYgp1+3682Nx0MD3D/HtkmZd49N3JUndYWQXfRZrYEnCWYc8BHcNmVsPAp9gKvlurdg/mubE6b/rPS9MA==} engines: {node: '>=16.0.0'} dependencies: '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/node-config-provider@3.1.9: resolution: {integrity: sha512-qRHoah49QJ71eemjuS/WhUXB+mpNtwHRWQr77J/m40ewBVVwvo52kYAmb7iuaECgGTTcYxHS4Wmewfwy++ueew==} @@ -8353,7 +8353,7 @@ packages: '@smithy/property-provider': 3.1.8 '@smithy/shared-ini-file-loader': 3.1.9 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/node-http-handler@3.1.4: resolution: {integrity: sha512-+UmxgixgOr/yLsUxcEKGH0fMNVteJFGkmRltYFHnBMlogyFdpzn2CwqWmxOrfJELhV34v0WSlaqG1UtE1uXlJg==} @@ -8363,7 +8363,7 @@ packages: '@smithy/protocol-http': 4.1.5 '@smithy/querystring-builder': 3.0.8 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/node-http-handler@3.2.5: resolution: {integrity: sha512-PkOwPNeKdvX/jCpn0A8n9/TyoxjGZB8WVoJmm9YzsnAgggTj4CrjpRHlTQw7dlLZ320n1mY1y+nTRUDViKi/3w==} @@ -8373,21 +8373,21 @@ packages: '@smithy/protocol-http': 4.1.5 '@smithy/querystring-builder': 3.0.8 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/property-provider@3.1.8: resolution: {integrity: sha512-ukNUyo6rHmusG64lmkjFeXemwYuKge1BJ8CtpVKmrxQxc6rhUX0vebcptFA9MmrGsnLhwnnqeH83VTU9hwOpjA==} engines: {node: '>=16.0.0'} dependencies: '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/protocol-http@4.1.5: resolution: {integrity: sha512-hsjtwpIemmCkm3ZV5fd/T0bPIugW1gJXwZ/hpuVubt2hEUApIoUTrf6qIdh9MAWlw0vjMrA1ztJLAwtNaZogvg==} engines: {node: '>=16.0.0'} dependencies: '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/querystring-builder@3.0.8: resolution: {integrity: sha512-btYxGVqFUARbUrN6VhL9c3dnSviIwBYD9Rz1jHuN1hgh28Fpv2xjU1HeCeDJX68xctz7r4l1PBnFhGg1WBBPuA==} @@ -8395,14 +8395,14 @@ packages: dependencies: '@smithy/types': 3.6.0 '@smithy/util-uri-escape': 3.0.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/querystring-parser@3.0.8: resolution: {integrity: sha512-BtEk3FG7Ks64GAbt+JnKqwuobJNX8VmFLBsKIwWr1D60T426fGrV2L3YS5siOcUhhp6/Y6yhBw1PSPxA5p7qGg==} engines: {node: '>=16.0.0'} dependencies: '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/service-error-classification@3.0.8: resolution: {integrity: sha512-uEC/kCCFto83bz5ZzapcrgGqHOh/0r69sZ2ZuHlgoD5kYgXJEThCoTuw/y1Ub3cE7aaKdznb+jD9xRPIfIwD7g==} @@ -8415,7 +8415,7 @@ packages: engines: {node: '>=16.0.0'} dependencies: '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/signature-v4@4.2.1: resolution: {integrity: sha512-NsV1jF4EvmO5wqmaSzlnTVetemBS3FZHdyc5CExbDljcyJCEEkJr8ANu2JvtNbVg/9MvKAWV44kTrGS+Pi4INg==} @@ -8428,7 +8428,7 @@ packages: '@smithy/util-middleware': 3.0.8 '@smithy/util-uri-escape': 3.0.0 '@smithy/util-utf8': 3.0.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/smithy-client@3.4.2: resolution: {integrity: sha512-dxw1BDxJiY9/zI3cBqfVrInij6ShjpV4fmGHesGZZUiP9OSE/EVfdwdRz0PgvkEvrZHpsj2htRaHJfftE8giBA==} @@ -8440,20 +8440,20 @@ packages: '@smithy/protocol-http': 4.1.5 '@smithy/types': 3.6.0 '@smithy/util-stream': 3.2.1 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/types@3.6.0: resolution: {integrity: sha512-8VXK/KzOHefoC65yRgCn5vG1cysPJjHnOVt9d0ybFQSmJgQj152vMn4EkYhGuaOmnnZvCPav/KnYyE6/KsNZ2w==} engines: {node: '>=16.0.0'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/url-parser@3.0.8: resolution: {integrity: sha512-4FdOhwpTW7jtSFWm7SpfLGKIBC9ZaTKG5nBF0wK24aoQKQyDIKUw3+KFWCQ9maMzrgTJIuOvOnsV2lLGW5XjTg==} dependencies: '@smithy/querystring-parser': 3.0.8 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/util-base64@3.0.0: resolution: {integrity: sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==} @@ -8461,38 +8461,38 @@ packages: dependencies: '@smithy/util-buffer-from': 3.0.0 '@smithy/util-utf8': 3.0.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/util-body-length-browser@3.0.0: resolution: {integrity: sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/util-body-length-node@3.0.0: resolution: {integrity: sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==} engines: {node: '>=16.0.0'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/util-buffer-from@2.0.0: resolution: {integrity: sha512-/YNnLoHsR+4W4Vf2wL5lGv0ksg8Bmk3GEGxn2vEQt52AQaPSCuaO5PM5VM7lP1K9qHRKHwrPGktqVoAHKWHxzw==} engines: {node: '>=14.0.0'} dependencies: '@smithy/is-array-buffer': 2.0.0 - tslib: 2.6.2 + tslib: 2.8.1 /@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 + tslib: 2.8.1 /@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 + tslib: 2.8.1 /@smithy/util-defaults-mode-browser@3.0.25: resolution: {integrity: sha512-fRw7zymjIDt6XxIsLwfJfYUfbGoO9CmCJk6rjJ/X5cd20+d2Is7xjU5Kt/AiDt6hX8DAf5dztmfP5O82gR9emA==} @@ -8502,7 +8502,7 @@ packages: '@smithy/smithy-client': 3.4.2 '@smithy/types': 3.6.0 bowser: 2.11.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/util-defaults-mode-node@3.0.25: resolution: {integrity: sha512-H3BSZdBDiVZGzt8TG51Pd2FvFO0PAx/A0mJ0EH8a13KJ6iUCdYnw/Dk/MdC1kTd0eUuUGisDFaxXVXo4HHFL1g==} @@ -8514,7 +8514,7 @@ packages: '@smithy/property-provider': 3.1.8 '@smithy/smithy-client': 3.4.2 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/util-endpoints@2.1.4: resolution: {integrity: sha512-kPt8j4emm7rdMWQyL0F89o92q10gvCUa6sBkBtDJ7nV2+P7wpXczzOfoDJ49CKXe5CCqb8dc1W+ZdLlrKzSAnQ==} @@ -8522,20 +8522,20 @@ packages: dependencies: '@smithy/node-config-provider': 3.1.9 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@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 + tslib: 2.8.1 /@smithy/util-middleware@3.0.8: resolution: {integrity: sha512-p7iYAPaQjoeM+AKABpYWeDdtwQNxasr4aXQEA/OmbOaug9V0odRVDy3Wx4ci8soljE/JXQo+abV0qZpW8NX0yA==} engines: {node: '>=16.0.0'} dependencies: '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/util-retry@3.0.8: resolution: {integrity: sha512-TCEhLnY581YJ+g1x0hapPz13JFqzmh/pMWL2KEFASC51qCfw3+Y47MrTmea4bUE5vsdxQ4F6/KFbUeSz22Q1ow==} @@ -8543,7 +8543,7 @@ packages: dependencies: '@smithy/service-error-classification': 3.0.8 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/util-stream@3.2.1: resolution: {integrity: sha512-R3ufuzJRxSJbE58K9AEnL/uSZyVdHzud9wLS8tIbXclxKzoe09CRohj2xV8wpx5tj7ZbiJaKYcutMm1eYgz/0A==} @@ -8556,27 +8556,27 @@ packages: '@smithy/util-buffer-from': 3.0.0 '@smithy/util-hex-encoding': 3.0.0 '@smithy/util-utf8': 3.0.0 - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/util-uri-escape@3.0.0: resolution: {integrity: sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==} engines: {node: '>=16.0.0'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@smithy/util-utf8@2.0.2: resolution: {integrity: sha512-qOiVORSPm6Ce4/Yu6hbSgNHABLP2VMv8QOC3tTDNHHlWY19pPyc++fBTbZPtx6egPXi4HQxKDnMxVxpbtX2GoA==} engines: {node: '>=14.0.0'} dependencies: '@smithy/util-buffer-from': 2.0.0 - tslib: 2.6.2 + tslib: 2.8.1 /@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 + tslib: 2.8.1 /@smithy/util-waiter@3.1.7: resolution: {integrity: sha512-d5yGlQtmN/z5eoTtIYgkvOw27US2Ous4VycnXatyoImIF9tzlcpnKqQ/V7qhvJmb2p6xZne1NopCLakdTnkBBQ==} @@ -8584,7 +8584,7 @@ packages: dependencies: '@smithy/abort-controller': 3.1.6 '@smithy/types': 3.6.0 - tslib: 2.6.2 + tslib: 2.8.1 /@swc/counter@0.1.3: resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==} @@ -8593,7 +8593,7 @@ packages: resolution: {integrity: sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==} dependencies: '@swc/counter': 0.1.3 - tslib: 2.6.2 + tslib: 2.8.1 /@szmarczak/http-timer@4.0.6: resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==} @@ -9737,7 +9737,7 @@ packages: '@types/node': 18.19.8 '@whatwg-node/events': 0.0.2 busboy: 1.6.0 - tslib: 2.6.2 + tslib: 2.8.1 dev: true /@whatwg-node/node-fetch@0.3.6: @@ -9747,38 +9747,38 @@ packages: busboy: 1.6.0 fast-querystring: 1.1.2 fast-url-parser: 1.1.3 - tslib: 2.6.2 + tslib: 2.8.1 dev: true /@wry/caches@1.0.1: resolution: {integrity: sha512-bXuaUNLVVkD20wcGBWRyo7j9N3TxePEWFZj2Y+r9OoUzfqmavM84+mFykRicNsBqatba5JLay1t48wxaXaWnlA==} engines: {node: '>=8'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@wry/context@0.7.4: resolution: {integrity: sha512-jmT7Sb4ZQWI5iyu3lobQxICu2nC/vbUhP0vIdd6tHC9PTfenmRmuIFqktc6GH9cgi+ZHnsLWPvfSvc4DrYmKiQ==} engines: {node: '>=8'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@wry/equality@0.5.7: resolution: {integrity: sha512-BRFORjsTuQv5gxcXsuDXx6oGRhuVsEGwZy6LOzRRfgu+eSfxbhUQ9L9YtSEIuIjY/o7g3iWFjrc5eSY1GXP2Dw==} engines: {node: '>=8'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@wry/trie@0.4.3: resolution: {integrity: sha512-I6bHwH0fSf6RqQcnnXLJKhkSXG45MFral3GxPaY4uAl0LYDZM+YDVDAiU9bYwjTuysy1S0IeecWtmq1SZA3M1w==} engines: {node: '>=8'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@wry/trie@0.5.0: resolution: {integrity: sha512-FNoYzHawTMk/6KMQoEG5O4PuioX19UbwdQKF44yw0nLfOypfQdjtfZzo/UIJWAJ23sNIFbD1Ug9lbaDGMwbqQA==} engines: {node: '>=8'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /@xtuc/ieee754@1.2.0: resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==} @@ -9812,6 +9812,7 @@ packages: /acorn-import-assertions@1.9.0(acorn@8.14.0): resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==} + deprecated: package has been renamed to acorn-import-attributes peerDependencies: acorn: ^8 dependencies: @@ -10273,7 +10274,7 @@ packages: dependencies: pvtsutils: 1.3.5 pvutils: 1.1.3 - tslib: 2.6.2 + tslib: 2.8.1 dev: true /assert-plus@1.0.0: @@ -10343,14 +10344,14 @@ packages: /axios@0.21.4: resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} dependencies: - follow-redirects: 1.15.5 + follow-redirects: 1.15.9 transitivePeerDependencies: - debug /axios@1.2.1: resolution: {integrity: sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==} dependencies: - follow-redirects: 1.15.5 + follow-redirects: 1.15.9 form-data: 4.0.0 proxy-from-env: 1.1.0 transitivePeerDependencies: @@ -10925,7 +10926,7 @@ packages: resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==} dependencies: pascal-case: 3.1.2 - tslib: 2.6.2 + tslib: 2.8.1 /camelcase-keys@6.2.2: resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==} @@ -10975,7 +10976,7 @@ packages: resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==} dependencies: no-case: 3.0.4 - tslib: 2.6.2 + tslib: 2.8.1 upper-case-first: 2.0.2 /caseless@0.12.0: @@ -11045,7 +11046,7 @@ packages: path-case: 3.0.4 sentence-case: 3.0.4 snake-case: 3.0.4 - tslib: 2.6.2 + tslib: 2.8.1 /change-case@5.4.2: resolution: {integrity: sha512-WB3UiTDpT+vrTilAWaJS4gaIH/jc1He4H9f6erQvraUYas90uWT0JOYFkG1imdNv710XJ6gJvqynrgOHc4ihDA==} @@ -11121,8 +11122,6 @@ packages: readdirp: 3.6.0 optionalDependencies: fsevents: 2.3.3 - dev: true - optional: true /chownr@2.0.0: resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} @@ -11479,7 +11478,7 @@ packages: resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==} dependencies: no-case: 3.0.4 - tslib: 2.6.2 + tslib: 2.8.1 upper-case: 2.0.2 /content-disposition@0.5.4: @@ -12151,7 +12150,7 @@ packages: resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==} dependencies: no-case: 3.0.4 - tslib: 2.6.2 + tslib: 2.8.1 /dotenv-cli@6.0.0: resolution: {integrity: sha512-qXlCOi3UMDhCWFKe0yq5sg3X+pJAz+RQDiFN38AMSbUrnY3uZshSfDJUAge951OS7J9gwLZGfsBlWRSOYz/TRg==} @@ -13325,7 +13324,7 @@ packages: resolution: {integrity: sha512-QlZ5yJC0VxHxQQsQhXvBaC7VRJ2uaxTf+Tfpu4Z/OcVQJVpZO+DGU0rkoVW5ce2SccxugvpBJoMvUs59iILYdw==} engines: {node: '>= 12'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /file-selector@2.1.0: resolution: {integrity: sha512-ZuXAqGePcSPz4JuerOY06Dzzq0hrmQ6VGoXVzGyFI1npeOfBgqGIKKpznfYWRkSLJlXutkqVC5WvGZtkFVhu9Q==} @@ -13471,15 +13470,6 @@ packages: /flatted@3.2.9: resolution: {integrity: sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==} - /follow-redirects@1.15.5: - resolution: {integrity: sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==} - engines: {node: '>=4.0'} - peerDependencies: - debug: '*' - peerDependenciesMeta: - debug: - optional: true - /follow-redirects@1.15.9: resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==} engines: {node: '>=4.0'} @@ -13488,7 +13478,6 @@ packages: peerDependenciesMeta: debug: optional: true - dev: true /for-each@0.3.3: resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} @@ -13515,7 +13504,7 @@ packages: dependencies: '@babel/code-frame': 7.23.5 chalk: 4.1.2 - chokidar: 3.5.3 + chokidar: 3.6.0 cosmiconfig: 7.1.0 deepmerge: 4.3.1 fs-extra: 10.1.0 @@ -13954,7 +13943,7 @@ packages: jiti: 1.17.1 minimatch: 4.2.3 string-env-interpolation: 1.0.1 - tslib: 2.6.2 + tslib: 2.8.1 transitivePeerDependencies: - '@types/node' - bufferutil @@ -13970,7 +13959,7 @@ packages: dependencies: debug: 4.3.7 graphql: 15.8.0 - tslib: 2.6.2 + tslib: 2.8.1 transitivePeerDependencies: - supports-color @@ -14006,7 +13995,7 @@ packages: 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 + tslib: 2.8.1 /graphql-tag@2.12.6(graphql@15.8.0): resolution: {integrity: sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==} @@ -14118,7 +14107,7 @@ packages: resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==} dependencies: capital-case: 1.0.4 - tslib: 2.6.2 + tslib: 2.8.1 /helmet@4.6.0: resolution: {integrity: sha512-HVqALKZlR95ROkrnesdhbbZJFi/rIVSoNq6f3jA/9u6MIbTsPh3xZwihjeI5+DO/2sOV6HMHooXcEOuwskHpTg==} @@ -14347,7 +14336,7 @@ packages: engines: {node: '>=8.0.0'} dependencies: eventemitter3: 4.0.7 - follow-redirects: 1.15.5 + follow-redirects: 1.15.9 requires-port: 1.0.0 transitivePeerDependencies: - debug @@ -14597,7 +14586,7 @@ packages: deprecated: We've written a new parser that's 6x faster and is backwards compatible. Please use @formatjs/icu-messageformat-parser dependencies: '@formatjs/ecma402-abstract': 1.6.3 - tslib: 2.6.2 + tslib: 2.8.1 dev: true /intl-messageformat@9.13.0: @@ -14606,7 +14595,7 @@ packages: '@formatjs/ecma402-abstract': 1.11.4 '@formatjs/fast-memoize': 1.2.1 '@formatjs/icu-messageformat-parser': 2.1.0 - tslib: 2.6.2 + tslib: 2.8.1 /invariant@2.2.4: resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==} @@ -14764,7 +14753,7 @@ packages: /is-lower-case@2.0.2: resolution: {integrity: sha512-bVcMJy4X5Og6VZfdOZstSexlEy20Sr0k/p/b2IlQJlfdKAQuMpiv5w2Ccxb8sKdRUNAG1PnHVHjFSdRDVS6NlQ==} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 dev: true /is-map@2.0.2: @@ -14913,7 +14902,7 @@ packages: /is-upper-case@2.0.2: resolution: {integrity: sha512-44pxmxAvnnAOwBg4tHPnkfvgjPwbc5QIsSstNU+YcJ1ovxVzCWpSGosPJOZh/a1tdl81fbgnLc9LLv+x2ywbPQ==} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 dev: true /is-weakmap@2.0.1: @@ -16685,7 +16674,7 @@ packages: /lower-case-first@2.0.2: resolution: {integrity: sha512-EVm/rR94FJTZi3zefZ82fLWab+GX14LJN4HrWBcuo6Evmsl9hEfnqxgcHCKb9q+mNf6EVdsjx/qucYFIIB84pg==} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 dev: true /lower-case@1.1.4: @@ -16695,7 +16684,7 @@ packages: /lower-case@2.0.2: resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /lowercase-keys@2.0.0: resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==} @@ -17100,7 +17089,7 @@ packages: hasBin: true dependencies: '@babel/runtime': 7.24.5 - chokidar: 3.5.3 + chokidar: 3.6.0 glob: 10.3.15 html-minifier: 4.0.0 js-beautify: 1.15.1 @@ -17599,7 +17588,7 @@ packages: resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==} dependencies: lower-case: 2.0.2 - tslib: 2.6.2 + tslib: 2.8.1 /node-abort-controller@3.1.1: resolution: {integrity: sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==} @@ -17909,7 +17898,7 @@ packages: '@wry/caches': 1.0.1 '@wry/context': 0.7.4 '@wry/trie': 0.4.3 - tslib: 2.6.2 + tslib: 2.8.1 /optionator@0.9.3: resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==} @@ -18052,7 +18041,7 @@ packages: resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==} dependencies: dot-case: 3.0.4 - tslib: 2.6.2 + tslib: 2.8.1 /parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} @@ -18118,7 +18107,7 @@ packages: resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==} dependencies: no-case: 3.0.4 - tslib: 2.6.2 + tslib: 2.8.1 /passport-custom@1.1.1: resolution: {integrity: sha512-/2m7jUGxmCYvoqenLB9UrmkCgPt64h8ZtV+UtuQklZ/Tn1NpKBeOorCYkB/8lMRoiZ5hUrCoMmDtxCS/d38mlg==} @@ -18157,7 +18146,7 @@ packages: resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==} dependencies: dot-case: 3.0.4 - tslib: 2.6.2 + tslib: 2.8.1 /path-exists@3.0.0: resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==} @@ -18655,7 +18644,7 @@ packages: /pvtsutils@1.3.5: resolution: {integrity: sha512-ARvb14YB9Nm2Xi6nBq1ZX6dAM0FsJnuk+31aUp4TrcZEdKUlSqOqsxJHUPJDNE3qiIp+iUPEIeR6Je/tgV7zsA==} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 dev: true /pvutils@1.1.3: @@ -19666,7 +19655,7 @@ packages: resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==} dependencies: no-case: 3.0.4 - tslib: 2.6.2 + tslib: 2.8.1 upper-case-first: 2.0.2 /serialize-javascript@6.0.2: @@ -19917,7 +19906,7 @@ packages: resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==} dependencies: dot-case: 3.0.4 - tslib: 2.6.2 + tslib: 2.8.1 /sockjs@0.3.24: resolution: {integrity: sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==} @@ -20044,7 +20033,7 @@ packages: /sponge-case@1.0.1: resolution: {integrity: sha512-dblb9Et4DAtiZ5YSUZHLl4XhH4uK80GhAZrVXdN4O2P4gQ40Wa5UIOPUHlA/nFd2PLblBZWUioLMMAVrgpoYcA==} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 dev: true /sprintf-js@1.0.3: @@ -20396,7 +20385,7 @@ packages: /swap-case@2.0.2: resolution: {integrity: sha512-kc6S2YS/2yXbtkSMunBtKdah4VFETZ8Oh6ONSmSd9bRxhqTrtARUCBUiWXH3xVPpvR7tz2CSnkuXVE42EcGnMw==} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 dev: true /symbol-observable@1.2.0: @@ -20568,7 +20557,7 @@ packages: /title-case@3.0.3: resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 dev: true /titleize@3.0.0: @@ -20690,7 +20679,7 @@ packages: resolution: {integrity: sha512-uivwYcQaxAucv1CzRp2n/QdYPo4ILf9VXgH19zEIjFx2EJufV16P0JtJVpYHy89DItG6Kwj2oIUjrcK5au+4tQ==} engines: {node: '>=8'} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /ts-jest@27.1.5(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5): resolution: {integrity: sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA==} @@ -21166,7 +21155,7 @@ packages: /upper-case-first@2.0.2: resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /upper-case@1.1.3: resolution: {integrity: sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==} @@ -21175,7 +21164,7 @@ packages: /upper-case@2.0.2: resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==} dependencies: - tslib: 2.6.2 + tslib: 2.8.1 /uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} @@ -21425,7 +21414,7 @@ packages: '@peculiar/json-schema': 1.1.12 asn1js: 3.0.5 pvtsutils: 1.3.5 - tslib: 2.6.2 + tslib: 2.8.1 dev: true /webidl-conversions@3.0.1: From 94c7eb4e8ef901cb3277766c2057d1a87353181a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 10:13:44 +0100 Subject: [PATCH 020/121] Replace dependency npm-run-all with npm-run-all2 ^5.0.0 (#135) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Raphael Blum --- demo/admin/package.json | 26 +++++++++++++------------- demo/api/package.json | 2 +- demo/campaign/package.json | 16 ++++++++-------- demo/site/package.json | 22 +++++++++++----------- package.json | 2 +- pnpm-lock.yaml | 38 ++++++++++++++++++++++++++------------ 6 files changed, 60 insertions(+), 46 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 8117122a..e6b9af63 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -3,24 +3,24 @@ "private": true, "scripts": { "admin-generator": "rimraf 'src/*/generated' && comet-admin-generator generate crud-generator-config.ts", - "postinstall": "cd server && npm install", - "start": "npm run intl:compile && run-p gql:types generate-block-types && dotenv -c secrets -- cross-env BABEL_ENV=development webpack serve --config ./webpack.config.ts --mode development", "build": "npm run intl:compile && run-p gql:types generate-block-types && cross-env BABEL_ENV=production webpack --config ./webpack.config.ts --mode production --progress", - "serve": "cd server && npm run serve", + "generate-block-types": "comet generate-block-types --inputs", + "generate-block-types:watch": "chokidar -s \"**/block-meta.json\" -c \"npm run generate-block-types\"", "gql:types": "graphql-codegen", "gql:watch": "graphql-codegen --watch", - "lint": "run-s intl:compile && run-p gql:types generate-block-types && run-p lint:prettier lint:eslint lint:tsc && $npm_execpath lint:generated-files-not-modified", - "lint:eslint": "eslint --max-warnings 0 --ext .ts,.tsx,.js,.jsx,.json,.md src/ package.json", - "lint:tsc": "tsc --project .", - "lint:prettier": "npx prettier --check './**/*.{js,json,md,yml,yaml}'", - "intl:extract": "formatjs extract \"src/**/*.ts*\" --ignore ./**.d.ts --out-file lang-extracted/en.json --format simple", + "postinstall": "cd server && npm install", + "intl:compile": "run-p intl:compile:comet intl:compile:comet-brevo-module-demo intl:compile:comet-brevo-module", + "intl:compile:comet": "formatjs compile-folder --format simple --ast lang/comet-lang lang-compiled/comet-lang", "intl:compile:comet-brevo-module": "formatjs compile-folder --format simple --ast lang/comet-brevo-module-lang lang-compiled/comet-brevo-module-lang", "intl:compile:comet-brevo-module-demo": "formatjs compile-folder --format simple --ast lang/comet-brevo-module-demo-lang/admin lang-compiled/comet-brevo-module-demo-lang", - "intl:compile:comet": "formatjs compile-folder --format simple --ast lang/comet-lang lang-compiled/comet-lang", - "intl:compile": "run-p intl:compile:comet intl:compile:comet-brevo-module-demo intl:compile:comet-brevo-module", + "intl:extract": "formatjs extract \"src/**/*.ts*\" --ignore ./**.d.ts --out-file lang-extracted/en.json --format simple", + "lint": "run-s intl:compile && run-p gql:types generate-block-types && run-p lint:prettier lint:eslint lint:tsc && $npm_execpath lint:generated-files-not-modified", + "lint:eslint": "eslint --max-warnings 0 --ext .ts,.tsx,.js,.jsx,.json,.md src/ package.json", "lint:generated-files-not-modified": "$npm_execpath admin-generator && git diff --exit-code HEAD --", - "generate-block-types": "comet generate-block-types --inputs", - "generate-block-types:watch": "chokidar -s \"**/block-meta.json\" -c \"npm run generate-block-types\"" + "lint:prettier": "npx prettier --check './**/*.{js,json,md,yml,yaml}'", + "lint:tsc": "tsc --project .", + "serve": "cd server && npm run serve", + "start": "npm run intl:compile && run-p gql:types generate-block-types && dotenv -c secrets -- cross-env BABEL_ENV=development webpack serve --config ./webpack.config.ts --mode development" }, "dependencies": { "@apollo/client": "^3.11.8", @@ -90,7 +90,7 @@ "dotenv-cli": "^6.0.0", "eslint": "^8.0.0", "html-webpack-plugin": "^5.0.0", - "npm-run-all": "^4.1.5", + "npm-run-all2": "^5.0.0", "prettier": "^2.2.1", "rimraf": "^3.0.0", "style-loader": "^3.0.0", diff --git a/demo/api/package.json b/demo/api/package.json index f8622936..1741de6b 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -14,7 +14,7 @@ "lint": "run-p lint:prettier lint:eslint lint:tsc && $npm_execpath lint:generated-files-not-modified", "lint:ci": "npm run lint && npm run lint:generated-files-not-modified", "lint:eslint": "eslint --ext .ts,.tsx,.js,.jsx,.json,.md --max-warnings 0 src/ package.json", - "lint:generated-files-not-modified": "npm run api-generator && git diff --exit-code HEAD --", + "lint:generated-files-not-modified": "$npm_execpath api-generator && git diff --exit-code HEAD --", "lint:prettier": "npx prettier --check './**/*.{js,json,md,yml,yaml}'", "lint:tsc": "tsc --project ./tsconfig.lint.json", "mikro-orm": "mikro-orm", diff --git a/demo/campaign/package.json b/demo/campaign/package.json index f13744a1..81d6e3ea 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -2,21 +2,21 @@ "name": "comet-brevo-module-demo-campaign", "private": true, "scripts": { + "copy-schema-files": "node copy-schema-files.js", "dev": "run-s gql:types generate-block-types && NODE_OPTIONS='--inspect=localhost:9230' dotenv -c secrets -- node server.js", - "preview-next-build": "next build", - "next-build": "next build", - "serve": "NODE_ENV=production node server.js", "export": "next export", + "generate-block-types": "comet generate-block-types", + "generate-block-types:watch": "chokidar -s \"**/block-meta.json\" -c \"npm run generate-block-types\"", "gql:types": "graphql-codegen", "gql:watch": "graphql-codegen --watch", "intl:extract": "formatjs extract \"src/**/*.ts*\" --ignore ./**.d.ts --out-file lang-extracted/en.json --format simple", "lint": "run-p gql:types generate-block-types && run-p lint:prettier lint:eslint lint:tsc", - "lint:prettier": "npx prettier --check './**/*.{js,json,md,yml,yaml}'", "lint:eslint": "eslint --max-warnings 0 --config ./.eslintrc.cli.js --ext .ts,.tsx,.js,.jsx,.json,.md src/ package.json", + "lint:prettier": "npx prettier --check './**/*.{js,json,md,yml,yaml}'", "lint:tsc": "tsc --project .", - "generate-block-types": "comet generate-block-types", - "generate-block-types:watch": "chokidar -s \"**/block-meta.json\" -c \"npm run generate-block-types\"", - "copy-schema-files": "node copy-schema-files.js" + "next-build": "next build", + "preview-next-build": "next build", + "serve": "NODE_ENV=production node server.js" }, "dependencies": { "@comet/cms-site": "^7.7.0", @@ -67,7 +67,7 @@ "chokidar-cli": "^2.0.0", "dotenv-cli": "^6.0.0", "eslint": "^8.0.0", - "npm-run-all": "^4.1.5", + "npm-run-all2": "^5.0.0", "prettier": "^2.0.0", "rimraf": "^3.0.0", "tsconfig-paths": "^3.0.0", diff --git a/demo/site/package.json b/demo/site/package.json index 6e1fc04e..e0bdd77e 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -2,27 +2,27 @@ "name": "comet-brevo-module-demo-site", "private": true, "scripts": { - "dev": "run-s gql:types generate-block-types && npm run build:preBuild && NODE_OPTIONS='--inspect=localhost:9230' dotenv -c secrets -- node server.js", - "preview-next-build": "next build", - "next-build": "npm run build:publicGenerated && next build", "build": "run-p gql:types generate-block-types && npm run build:preBuild", "build:preBuild": "run-s clear:preBuild build:preBuild:tsc", "build:preBuild:tsc": "tsc --project tsconfig.preBuild.json", "build:publicGenerated": "node preBuild/build/preBuild/src/publicGenerator/generate.js", - "extract:publicGenerated": "node preBuild/build/preBuild/src/publicGenerator/extract.js", - "serve": "npm run extract:publicGenerated && NODE_ENV=production node server.js", + "clear:preBuild": "rimraf preBuild/build", + "copy-schema-files": "node copy-schema-files.js", + "dev": "run-s gql:types generate-block-types && npm run build:preBuild && NODE_OPTIONS='--inspect=localhost:9230' dotenv -c secrets -- node server.js", "export": "next export", + "extract:publicGenerated": "node preBuild/build/preBuild/src/publicGenerator/extract.js", + "generate-block-types": "comet generate-block-types", + "generate-block-types:watch": "chokidar -s \"**/block-meta.json\" -c \"npm run generate-block-types\"", "gql:types": "graphql-codegen", "gql:watch": "graphql-codegen --watch", - "clear:preBuild": "rimraf preBuild/build", "lint": "run-p gql:types generate-block-types && run-p lint:prettier lint:eslint lint:tsc", - "lint:prettier": "npx prettier --check './**/*.{js,json,md,yml,yaml}'", "lint:eslint": "eslint --max-warnings 0 --config ./.eslintrc.cli.js --ext .ts,.tsx,.js,.jsx,.json,.md src/ package.json", + "lint:prettier": "npx prettier --check './**/*.{js,json,md,yml,yaml}'", "lint:tsc": "tsc --project .", "lint:tscPreBuild": "tsc --project tsconfig.preBuild.json", - "generate-block-types": "comet generate-block-types", - "generate-block-types:watch": "chokidar -s \"**/block-meta.json\" -c \"npm run generate-block-types\"", - "copy-schema-files": "node copy-schema-files.js" + "next-build": "npm run build:publicGenerated && next build", + "preview-next-build": "next build", + "serve": "npm run extract:publicGenerated && NODE_ENV=production node server.js" }, "dependencies": { "@comet/cms-site": "^7.7.0", @@ -68,7 +68,7 @@ "chokidar-cli": "^2.0.0", "dotenv-cli": "^6.0.0", "eslint": "^8.0.0", - "npm-run-all": "^4.1.5", + "npm-run-all2": "^5.0.0", "prettier": "^2.0.0", "rimraf": "^3.0.0", "tsconfig-paths": "^3.0.0", diff --git a/package.json b/package.json index c33c73ac..8974a84e 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "dotenv-cli": "^6.0.0", "husky": "^7.0.1", "lint-staged": "^12.3.7", - "npm-run-all": "^4.1.5", + "npm-run-all2": "^5.0.0", "open-cli": "^7.0.0", "prettier": "^2.3.2", "ts-node": "^10.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 335ac6f8..0d7bbc49 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -31,9 +31,9 @@ importers: lint-staged: specifier: ^12.3.7 version: 12.5.0 - npm-run-all: - specifier: ^4.1.5 - version: 4.1.5 + npm-run-all2: + specifier: ^5.0.0 + version: 5.0.2 open-cli: specifier: ^7.0.0 version: 7.2.0 @@ -245,9 +245,9 @@ importers: html-webpack-plugin: specifier: ^5.0.0 version: 5.6.0(webpack@5.94.0) - npm-run-all: - specifier: ^4.1.5 - version: 4.1.5 + npm-run-all2: + specifier: ^5.0.0 + version: 5.0.2 prettier: specifier: ^2.2.1 version: 2.8.8 @@ -628,9 +628,9 @@ importers: eslint: specifier: ^8.0.0 version: 8.56.0 - npm-run-all: - specifier: ^4.1.5 - version: 4.1.5 + npm-run-all2: + specifier: ^5.0.0 + version: 5.0.2 prettier: specifier: ^2.0.0 version: 2.8.8 @@ -770,9 +770,9 @@ importers: eslint: specifier: ^8.0.0 version: 8.56.0 - npm-run-all: - specifier: ^4.1.5 - version: 4.1.5 + npm-run-all2: + specifier: ^5.0.0 + version: 5.0.2 prettier: specifier: ^2.0.0 version: 2.8.8 @@ -17683,6 +17683,20 @@ packages: resolution: {integrity: sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==} engines: {node: '>=10'} + /npm-run-all2@5.0.2: + resolution: {integrity: sha512-S2G6FWZ3pNWAAKm2PFSOtEAG/N+XO/kz3+9l6V91IY+Y3XFSt7Lp7DV92KCgEboEW0hRTu0vFaMe4zXDZYaOyA==} + engines: {node: '>= 10'} + hasBin: true + dependencies: + ansi-styles: 5.2.0 + cross-spawn: 7.0.3 + memorystream: 0.3.1 + minimatch: 3.1.2 + pidtree: 0.5.0 + read-pkg: 5.2.0 + shell-quote: 1.8.1 + dev: true + /npm-run-all@4.1.5: resolution: {integrity: sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==} engines: {node: '>= 4'} From 9fbfb67346c7eacbfaa13e1e07f855a786b60e96 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 10:14:29 +0100 Subject: [PATCH 021/121] Update dependency @changesets/cli to ^2.27.9 (#141) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 374 ++++++++++--------------------------------------- 2 files changed, 75 insertions(+), 301 deletions(-) diff --git a/package.json b/package.json index 8974a84e..7e313948 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ }, "devDependencies": { "@comet/dev-process-manager": "^2.6.1", - "@changesets/cli": "^2.27.1", + "@changesets/cli": "^2.27.9", "@formatjs/cli": "^4.8.3", "@types/node": "^18.0.0", "dotenv-cli": "^6.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0d7bbc49..923523e5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,8 +11,8 @@ importers: .: devDependencies: '@changesets/cli': - specifier: ^2.27.1 - version: 2.27.1 + specifier: ^2.27.9 + version: 2.27.9 '@comet/dev-process-manager': specifier: ^2.6.1 version: 2.6.1 @@ -3523,13 +3523,13 @@ packages: requireindex: 1.1.0 dev: true - /@changesets/apply-release-plan@7.0.0: - resolution: {integrity: sha512-vfi69JR416qC9hWmFGSxj7N6wA5J222XNBmezSVATPWDVPIF7gkd4d8CpbEbXmRWbVrkoli3oerGS6dcL/BGsQ==} + /@changesets/apply-release-plan@7.0.5: + resolution: {integrity: sha512-1cWCk+ZshEkSVEZrm2fSj1Gz8sYvxgUL4Q78+1ZZqeqfuevPTPk033/yUZ3df8BKMohkqqHfzj0HOOrG0KtXTw==} dependencies: - '@babel/runtime': 7.24.5 - '@changesets/config': 3.0.0 + '@changesets/config': 3.0.3 '@changesets/get-version-range-type': 0.4.0 - '@changesets/git': 3.0.0 + '@changesets/git': 3.0.1 + '@changesets/should-skip-package': 0.1.1 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 detect-indent: 6.1.0 @@ -3541,12 +3541,12 @@ packages: semver: 7.5.4 dev: true - /@changesets/assemble-release-plan@6.0.0: - resolution: {integrity: sha512-4QG7NuisAjisbW4hkLCmGW2lRYdPrKzro+fCtZaILX+3zdUELSvYjpL4GTv0E4aM9Mef3PuIQp89VmHJ4y2bfw==} + /@changesets/assemble-release-plan@6.0.4: + resolution: {integrity: sha512-nqICnvmrwWj4w2x0fOhVj2QEGdlUuwVAwESrUo5HLzWMI1rE5SWfsr9ln+rDqWB6RQ2ZyaMZHUcU7/IRaUJS+Q==} dependencies: - '@babel/runtime': 7.24.5 '@changesets/errors': 0.2.0 - '@changesets/get-dependents-graph': 2.0.0 + '@changesets/get-dependents-graph': 2.1.2 + '@changesets/should-skip-package': 0.1.1 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 semver: 7.5.4 @@ -3558,50 +3558,46 @@ packages: '@changesets/types': 6.0.0 dev: true - /@changesets/cli@2.27.1: - resolution: {integrity: sha512-iJ91xlvRnnrJnELTp4eJJEOPjgpF3NOh4qeQehM6Ugiz9gJPRZ2t+TsXun6E3AMN4hScZKjqVXl0TX+C7AB3ZQ==} + /@changesets/cli@2.27.9: + resolution: {integrity: sha512-q42a/ZbDnxPpCb5Wkm6tMVIxgeI9C/bexntzTeCFBrQEdpisQqk8kCHllYZMDjYtEc1ZzumbMJAG8H0Z4rdvjg==} hasBin: true dependencies: - '@babel/runtime': 7.23.8 - '@changesets/apply-release-plan': 7.0.0 - '@changesets/assemble-release-plan': 6.0.0 + '@changesets/apply-release-plan': 7.0.5 + '@changesets/assemble-release-plan': 6.0.4 '@changesets/changelog-git': 0.2.0 - '@changesets/config': 3.0.0 + '@changesets/config': 3.0.3 '@changesets/errors': 0.2.0 - '@changesets/get-dependents-graph': 2.0.0 - '@changesets/get-release-plan': 4.0.0 - '@changesets/git': 3.0.0 - '@changesets/logger': 0.1.0 - '@changesets/pre': 2.0.0 - '@changesets/read': 0.6.0 + '@changesets/get-dependents-graph': 2.1.2 + '@changesets/get-release-plan': 4.0.4 + '@changesets/git': 3.0.1 + '@changesets/logger': 0.1.1 + '@changesets/pre': 2.0.1 + '@changesets/read': 0.6.1 + '@changesets/should-skip-package': 0.1.1 '@changesets/types': 6.0.0 - '@changesets/write': 0.3.0 + '@changesets/write': 0.3.2 '@manypkg/get-packages': 1.1.3 - '@types/semver': 7.5.6 ansi-colors: 4.1.3 - chalk: 2.4.2 ci-info: 3.9.0 enquirer: 2.4.1 external-editor: 3.1.0 fs-extra: 7.0.1 - human-id: 1.0.2 - meow: 6.1.1 - outdent: 0.5.0 + mri: 1.2.0 p-limit: 2.3.0 - preferred-pm: 3.1.2 + package-manager-detector: 0.2.2 + picocolors: 1.1.1 resolve-from: 5.0.0 semver: 7.5.4 spawndamnit: 2.0.0 term-size: 2.2.1 - tty-table: 4.2.3 dev: true - /@changesets/config@3.0.0: - resolution: {integrity: sha512-o/rwLNnAo/+j9Yvw9mkBQOZySDYyOr/q+wptRLcAVGlU6djOeP9v1nlalbL9MFsobuBVQbZCTp+dIzdq+CLQUA==} + /@changesets/config@3.0.3: + resolution: {integrity: sha512-vqgQZMyIcuIpw9nqFIpTSNyc/wgm/Lu1zKN5vECy74u95Qx/Wa9g27HdgO4NkVAaq+BGA8wUc/qvbvVNs93n6A==} dependencies: '@changesets/errors': 0.2.0 - '@changesets/get-dependents-graph': 2.0.0 - '@changesets/logger': 0.1.0 + '@changesets/get-dependents-graph': 2.1.2 + '@changesets/logger': 0.1.1 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 @@ -3614,24 +3610,22 @@ packages: extendable-error: 0.1.7 dev: true - /@changesets/get-dependents-graph@2.0.0: - resolution: {integrity: sha512-cafUXponivK4vBgZ3yLu944mTvam06XEn2IZGjjKc0antpenkYANXiiE6GExV/yKdsCnE8dXVZ25yGqLYZmScA==} + /@changesets/get-dependents-graph@2.1.2: + resolution: {integrity: sha512-sgcHRkiBY9i4zWYBwlVyAjEM9sAzs4wYVwJUdnbDLnVG3QwAaia1Mk5P8M7kraTOZN+vBET7n8KyB0YXCbFRLQ==} dependencies: '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 - chalk: 2.4.2 - fs-extra: 7.0.1 + picocolors: 1.1.1 semver: 7.5.4 dev: true - /@changesets/get-release-plan@4.0.0: - resolution: {integrity: sha512-9L9xCUeD/Tb6L/oKmpm8nyzsOzhdNBBbt/ZNcjynbHC07WW4E1eX8NMGC5g5SbM5z/V+MOrYsJ4lRW41GCbg3w==} + /@changesets/get-release-plan@4.0.4: + resolution: {integrity: sha512-SicG/S67JmPTrdcc9Vpu0wSQt7IiuN0dc8iR5VScnnTVPfIaLvKmEGRvIaF0kcn8u5ZqLbormZNTO77bCEvyWw==} dependencies: - '@babel/runtime': 7.24.5 - '@changesets/assemble-release-plan': 6.0.0 - '@changesets/config': 3.0.0 - '@changesets/pre': 2.0.0 - '@changesets/read': 0.6.0 + '@changesets/assemble-release-plan': 6.0.4 + '@changesets/config': 3.0.3 + '@changesets/pre': 2.0.1 + '@changesets/read': 0.6.1 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 dev: true @@ -3640,22 +3634,20 @@ packages: resolution: {integrity: sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==} dev: true - /@changesets/git@3.0.0: - resolution: {integrity: sha512-vvhnZDHe2eiBNRFHEgMiGd2CT+164dfYyrJDhwwxTVD/OW0FUD6G7+4DIx1dNwkwjHyzisxGAU96q0sVNBns0w==} + /@changesets/git@3.0.1: + resolution: {integrity: sha512-pdgHcYBLCPcLd82aRcuO0kxCDbw/yISlOtkmwmE8Odo1L6hSiZrBOsRl84eYG7DRCab/iHnOkWqExqc4wxk2LQ==} dependencies: - '@babel/runtime': 7.24.5 '@changesets/errors': 0.2.0 - '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 is-subdir: 1.2.0 micromatch: 4.0.5 spawndamnit: 2.0.0 dev: true - /@changesets/logger@0.1.0: - resolution: {integrity: sha512-pBrJm4CQm9VqFVwWnSqKEfsS2ESnwqwH+xR7jETxIErZcfd1u2zBSqrHbRHR7xjhSgep9x2PSKFKY//FAshA3g==} + /@changesets/logger@0.1.1: + resolution: {integrity: sha512-OQtR36ZlnuTxKqoW4Sv6x5YIhOmClRd5pWsjZsddYxpWs517R0HkyiefQPIytCVh4ZcC5x9XaG8KTdd5iRQUfg==} dependencies: - chalk: 2.4.2 + picocolors: 1.1.1 dev: true /@changesets/parse@0.4.0: @@ -3665,27 +3657,32 @@ packages: js-yaml: 3.14.1 dev: true - /@changesets/pre@2.0.0: - resolution: {integrity: sha512-HLTNYX/A4jZxc+Sq8D1AMBsv+1qD6rmmJtjsCJa/9MSRybdxh0mjbTvE6JYZQ/ZiQ0mMlDOlGPXTm9KLTU3jyw==} + /@changesets/pre@2.0.1: + resolution: {integrity: sha512-vvBJ/If4jKM4tPz9JdY2kGOgWmCowUYOi5Ycv8dyLnEE8FgpYYUo1mgJZxcdtGGP3aG8rAQulGLyyXGSLkIMTQ==} dependencies: - '@babel/runtime': 7.24.5 '@changesets/errors': 0.2.0 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 dev: true - /@changesets/read@0.6.0: - resolution: {integrity: sha512-ZypqX8+/im1Fm98K4YcZtmLKgjs1kDQ5zHpc2U1qdtNBmZZfo/IBiG162RoP0CUF05tvp2y4IspH11PLnPxuuw==} + /@changesets/read@0.6.1: + resolution: {integrity: sha512-jYMbyXQk3nwP25nRzQQGa1nKLY0KfoOV7VLgwucI0bUO8t8ZLCr6LZmgjXsiKuRDc+5A6doKPr9w2d+FEJ55zQ==} dependencies: - '@babel/runtime': 7.24.5 - '@changesets/git': 3.0.0 - '@changesets/logger': 0.1.0 + '@changesets/git': 3.0.1 + '@changesets/logger': 0.1.1 '@changesets/parse': 0.4.0 '@changesets/types': 6.0.0 - chalk: 2.4.2 fs-extra: 7.0.1 p-filter: 2.1.0 + picocolors: 1.1.1 + dev: true + + /@changesets/should-skip-package@0.1.1: + resolution: {integrity: sha512-H9LjLbF6mMHLtJIc/eHR9Na+MifJ3VxtgP/Y+XLn4BF7tDTEN1HNYtH6QMcjP1uxp9sjaFYmW8xqloaCi/ckTg==} + dependencies: + '@changesets/types': 6.0.0 + '@manypkg/get-packages': 1.1.3 dev: true /@changesets/types@4.1.0: @@ -3696,10 +3693,9 @@ packages: resolution: {integrity: sha512-b1UkfNulgKoWfqyHtzKS5fOZYSJO+77adgL7DLRDr+/7jhChN+QcHnbjiQVOz/U+Ts3PGNySq7diAItzDgugfQ==} dev: true - /@changesets/write@0.3.0: - resolution: {integrity: sha512-slGLb21fxZVUYbyea+94uFiD6ntQW0M2hIKNznFizDhZPDgn2c/fv1UzzlW43RVzh1BEDuIqW6hzlJ1OflNmcw==} + /@changesets/write@0.3.2: + resolution: {integrity: sha512-kDxDrPNpUgsjDbWBvUo27PzKX4gqeKOlhibaOXDJA6kuBisGqNHv/HwGJrAu8U/dSf8ZEFIeHIPtvSlZI1kULw==} dependencies: - '@babel/runtime': 7.24.5 '@changesets/types': 6.0.0 fs-extra: 7.0.1 human-id: 1.0.2 @@ -4733,7 +4729,7 @@ packages: optional: true dependencies: '@formatjs/icu-messageformat-parser': 2.1.0 - '@types/node': 14.18.63 + '@types/node': 17.0.45 chalk: 4.1.2 tslib: 2.8.1 typescript: 4.9.5 @@ -5708,14 +5704,14 @@ packages: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 22.9.0 + '@types/node': 18.19.8 ansi-escapes: 4.3.2 chalk: 4.1.2 ci-info: 3.9.0 exit: 0.1.2 graceful-fs: 4.2.11 jest-changed-files: 29.7.0 - jest-config: 29.7.0(@types/node@22.9.0)(ts-node@10.9.2) + jest-config: 29.7.0(@types/node@18.19.8)(ts-node@10.9.2) jest-haste-map: 29.7.0 jest-message-util: 29.7.0 jest-regex-util: 29.6.3 @@ -6025,7 +6021,7 @@ packages: '@jest/schemas': 29.6.3 '@types/istanbul-lib-coverage': 2.0.6 '@types/istanbul-reports': 3.0.4 - '@types/node': 22.9.0 + '@types/node': 18.19.8 '@types/yargs': 17.0.32 chalk: 4.1.2 dev: true @@ -10784,12 +10780,6 @@ packages: dependencies: fill-range: 7.0.1 - /breakword@1.0.6: - resolution: {integrity: sha512-yjxDAYyK/pBvws9H4xKYpLDpYKEH6CzrBPAuXq3x18I+c/2MkVtT3qAr7Oloi6Dss9qNhPVueAAVU1CSeNDIXw==} - dependencies: - wcwidth: 1.0.1 - dev: true - /browser-process-hrtime@1.0.0: resolution: {integrity: sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==} dev: true @@ -10928,15 +10918,6 @@ packages: pascal-case: 3.1.2 tslib: 2.8.1 - /camelcase-keys@6.2.2: - resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==} - engines: {node: '>=8'} - dependencies: - camelcase: 5.3.1 - map-obj: 4.3.0 - quick-lru: 4.0.1 - dev: true - /camelcase-keys@8.0.2: resolution: {integrity: sha512-qMKdlOfsjlezMqxkUGGMaWWs17i2HoL15tM+wtx8ld4nLrUwU58TFdvyGOz/piNP842KeO8yXvggVQSdQ828NA==} engines: {node: '>=14.16'} @@ -11750,28 +11731,6 @@ packages: /csstype@3.1.3: resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} - /csv-generate@3.4.3: - resolution: {integrity: sha512-w/T+rqR0vwvHqWs/1ZyMDWtHHSJaN06klRqJXBEpDJaM/+dZkso0OKh1VcuuYvK3XM53KysVNq8Ko/epCK8wOw==} - dev: true - - /csv-parse@4.16.3: - resolution: {integrity: sha512-cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg==} - dev: true - - /csv-stringify@5.6.5: - resolution: {integrity: sha512-PjiQ659aQ+fUTQqSrd1XEDnOr52jh30RBurfzkscaE2tPaFsDH5wOAHJiw8XAHphRknCwMUE9KRayc4K/NbO8A==} - dev: true - - /csv@5.5.3: - resolution: {integrity: sha512-QTaY0XjjhTQOdguARF0lGKm5/mEq9PD9/VhZZegHDIBq2tQwgNpHc3dneD4mGo2iJs+fTKv5Bp0fZ+BRuY3Z0g==} - engines: {node: '>= 0.1.90'} - dependencies: - csv-generate: 3.4.3 - csv-parse: 4.16.3 - csv-stringify: 5.6.5 - stream-transform: 2.1.3 - dev: true - /currently-unhandled@0.4.1: resolution: {integrity: sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==} engines: {node: '>=0.10.0'} @@ -13448,13 +13407,6 @@ packages: path-exists: 5.0.0 dev: true - /find-yarn-workspace-root2@1.2.16: - resolution: {integrity: sha512-hr6hb1w8ePMpPVUK39S4RlwJzi+xPLuVuG8XlwXU3KD5Yn3qgBWVfy3AzNlDhWvE1EORCE65/Qm26rFQt3VLVA==} - dependencies: - micromatch: 4.0.5 - pkg-dir: 4.2.0 - dev: true - /flat-cache@3.2.0: resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==} engines: {node: ^10.12.0 || >=12.0.0} @@ -13915,10 +13867,6 @@ packages: /graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} - /grapheme-splitter@1.0.4: - resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==} - dev: true - /graphemer@1.4.0: resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} @@ -15266,47 +15214,6 @@ packages: - supports-color dev: true - /jest-config@29.7.0(@types/node@22.9.0)(ts-node@10.9.2): - resolution: {integrity: sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - peerDependencies: - '@types/node': '*' - ts-node: '>=9.0.0' - peerDependenciesMeta: - '@types/node': - optional: true - ts-node: - optional: true - dependencies: - '@babel/core': 7.23.7 - '@jest/test-sequencer': 29.7.0 - '@jest/types': 29.6.3 - '@types/node': 22.9.0 - babel-jest: 29.7.0(@babel/core@7.23.7) - chalk: 4.1.2 - ci-info: 3.9.0 - deepmerge: 4.3.1 - glob: 7.2.3 - graceful-fs: 4.2.11 - jest-circus: 29.7.0 - jest-environment-node: 29.7.0 - jest-get-type: 29.6.3 - jest-regex-util: 29.6.3 - jest-resolve: 29.7.0 - jest-runner: 29.7.0 - jest-util: 29.7.0 - jest-validate: 29.7.0 - micromatch: 4.0.5 - parse-json: 5.2.0 - pretty-format: 29.7.0 - slash: 3.0.0 - strip-json-comments: 3.1.1 - ts-node: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) - transitivePeerDependencies: - - babel-plugin-macros - - supports-color - dev: true - /jest-diff@27.5.1: resolution: {integrity: sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -16310,11 +16217,6 @@ packages: engines: {node: '>=6'} dev: true - /kleur@4.1.5: - resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==} - engines: {node: '>=6'} - dev: true - /knex@2.5.1(pg@8.11.3): resolution: {integrity: sha512-z78DgGKUr4SE/6cm7ku+jHvFT0X97aERh/f0MUKAKgFnwCYBEW4TFBqtHWFYiJFid7fMrtpZ/gxJthvz5mEByA==} engines: {node: '>=12'} @@ -16474,16 +16376,6 @@ packages: strip-bom: 3.0.0 dev: true - /load-yaml-file@0.2.0: - resolution: {integrity: sha512-OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw==} - engines: {node: '>=6'} - dependencies: - graceful-fs: 4.2.11 - js-yaml: 3.14.1 - pify: 4.0.1 - strip-bom: 3.0.0 - dev: true - /loader-runner@4.3.0: resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==} engines: {node: '>=6.11.5'} @@ -16847,23 +16739,6 @@ packages: yargs-parser: 21.1.1 dev: true - /meow@6.1.1: - resolution: {integrity: sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==} - engines: {node: '>=8'} - dependencies: - '@types/minimist': 1.2.5 - camelcase-keys: 6.2.2 - decamelize-keys: 1.1.1 - hard-rejection: 2.1.0 - minimist-options: 4.1.0 - normalize-package-data: 2.5.0 - read-pkg-up: 7.0.1 - redent: 3.0.0 - trim-newlines: 3.0.1 - type-fest: 0.13.1 - yargs-parser: 18.1.3 - dev: true - /merge-descriptors@1.0.1: resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==} @@ -17035,11 +16910,6 @@ packages: minipass: 3.3.6 yallist: 4.0.0 - /mixme@0.5.10: - resolution: {integrity: sha512-5H76ANWinB1H3twpJ6JY8uvAtpmFvHNArpilJAjXRKXSDDLPIMoZArw5SH0q9z+lLs8IrMw7Q2VWpWimFKFT1Q==} - engines: {node: '>= 8.0.0'} - dev: true - /mjml-accordion@4.15.3: resolution: {integrity: sha512-LPNVSj1LyUVYT9G1gWwSw3GSuDzDsQCu0tPB2uDsq4VesYNnU6v3iLCQidMiR6azmIt13OEozG700ygAUuA6Ng==} dependencies: @@ -17426,6 +17296,11 @@ packages: /module-not-found-error@1.0.1: resolution: {integrity: sha512-pEk4ECWQXV6z2zjhRZUongnLJNUeGQJ3w6OQ5ctGwD+i5o93qjRQUk2Rt6VdNeu3sEP0AB4LcfvdebpxBRVr4g==} + /mri@1.2.0: + resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==} + engines: {node: '>=4'} + dev: true + /mrmime@1.0.1: resolution: {integrity: sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==} engines: {node: '>=10'} @@ -18039,6 +17914,10 @@ packages: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} + /package-manager-detector@0.2.2: + resolution: {integrity: sha512-VgXbyrSNsml4eHWIvxxG/nTL4wgybMTXCV2Un/+yEc3aDKKU6nQBZjbeP3Pl3qm9Qg92X/1ng4ffvCeD/zwHgg==} + dev: true + /packet-reader@1.0.0: resolution: {integrity: sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==} @@ -18488,16 +18367,6 @@ packages: dependencies: xtend: 4.0.2 - /preferred-pm@3.1.2: - resolution: {integrity: sha512-nk7dKrcW8hfCZ4H6klWcdRknBOXWzNQByJ0oJyX97BOupsYD+FzLS4hflgEu/uPUEHZCuRfMxzCBsuWd7OzT8Q==} - engines: {node: '>=10'} - dependencies: - find-up: 5.0.0 - find-yarn-workspace-root2: 1.2.16 - path-exists: 4.0.0 - which-pm: 2.0.0 - dev: true - /prelude-ls@1.2.1: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} @@ -18712,11 +18581,6 @@ packages: /queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} - /quick-lru@4.0.1: - resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==} - engines: {node: '>=8'} - dev: true - /quick-lru@5.1.1: resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==} engines: {node: '>=10'} @@ -19054,15 +18918,6 @@ packages: dependencies: loose-envify: 1.4.0 - /read-pkg-up@7.0.1: - resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==} - engines: {node: '>=8'} - dependencies: - find-up: 4.1.0 - read-pkg: 5.2.0 - type-fest: 0.8.1 - dev: true - /read-pkg-up@9.1.0: resolution: {integrity: sha512-vaMRR1AC1nrd5CQM0PhlRsO5oc2AAigqr7cCrZ/MW/Rsaflz4RlgzkpL4qoU/z1F6wrbd85iFv1OQj/y5RdGvg==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -19081,16 +18936,6 @@ packages: path-type: 3.0.0 dev: true - /read-pkg@5.2.0: - resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==} - engines: {node: '>=8'} - dependencies: - '@types/normalize-package-data': 2.4.4 - normalize-package-data: 2.5.0 - parse-json: 5.2.0 - type-fest: 0.6.0 - dev: true - /read-pkg@7.1.0: resolution: {integrity: sha512-5iOehe+WF75IccPc30bWTbpdDQLOCc3Uu8bi3Dte3Eueij81yx1Mrufk8qBx/YAbR4uL1FdUr+7BKXDwEtisXg==} engines: {node: '>=12.20'} @@ -19170,14 +19015,6 @@ packages: dependencies: resolve: 1.22.8 - /redent@3.0.0: - resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==} - engines: {node: '>=8'} - dependencies: - indent-string: 4.0.0 - strip-indent: 3.0.0 - dev: true - /redent@4.0.0: resolution: {integrity: sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==} engines: {node: '>=12'} @@ -19903,19 +19740,6 @@ packages: resolution: {integrity: sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw==} engines: {node: '>=8.0.0'} - /smartwrap@2.0.2: - resolution: {integrity: sha512-vCsKNQxb7PnCNd2wY1WClWifAc2lwqsG8OaswpJkVJsvMGcnEntdTCDajZCkk93Ay1U3t/9puJmb525Rg5MZBA==} - engines: {node: '>=6'} - hasBin: true - dependencies: - array.prototype.flat: 1.3.2 - breakword: 1.0.6 - grapheme-splitter: 1.0.4 - strip-ansi: 6.0.1 - wcwidth: 1.0.1 - yargs: 15.4.1 - dev: true - /snake-case@3.0.4: resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==} dependencies: @@ -20098,12 +19922,6 @@ packages: transitivePeerDependencies: - supports-color - /stream-transform@2.1.3: - resolution: {integrity: sha512-9GHUiM5hMiCi6Y03jD2ARC1ettBXkQBoQAe7nJsPknnI0ow10aXjTnew8QtYQmLjzn974BnmWEAJgCY6ZP1DeQ==} - dependencies: - mixme: 0.5.10 - dev: true - /streamsearch@0.1.2: resolution: {integrity: sha512-jos8u++JKm0ARcSUTAZXOVC0mSox7Bhn6sBgty73P1f3JGf7yG2clTbBNHUdde/kdvP2FESam+vM6l8jBrNxHA==} engines: {node: '>=0.8.0'} @@ -20255,13 +20073,6 @@ packages: engines: {node: '>=12'} dev: true - /strip-indent@3.0.0: - resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==} - engines: {node: '>=8'} - dependencies: - min-indent: 1.0.1 - dev: true - /strip-indent@4.0.0: resolution: {integrity: sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==} engines: {node: '>=12'} @@ -20670,11 +20481,6 @@ packages: hasBin: true dev: true - /trim-newlines@3.0.1: - resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==} - engines: {node: '>=8'} - dev: true - /trim-newlines@4.1.1: resolution: {integrity: sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==} engines: {node: '>=12'} @@ -20886,20 +20692,6 @@ packages: typescript: 4.9.5 dev: true - /tty-table@4.2.3: - resolution: {integrity: sha512-Fs15mu0vGzCrj8fmJNP7Ynxt5J7praPXqFN0leZeZBXJwkMxv9cb2D454k1ltrtUSJbZ4yH4e0CynsHLxmUfFA==} - engines: {node: '>=8.0.0'} - hasBin: true - dependencies: - chalk: 4.1.2 - csv: 5.5.3 - kleur: 4.1.5 - smartwrap: 2.0.2 - strip-ansi: 6.0.1 - wcwidth: 1.0.1 - yargs: 17.7.2 - dev: true - /tunnel-agent@0.6.0: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} dependencies: @@ -20919,11 +20711,6 @@ packages: engines: {node: '>=4'} dev: true - /type-fest@0.13.1: - resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==} - engines: {node: '>=10'} - dev: true - /type-fest@0.20.2: resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==} engines: {node: '>=10'} @@ -20933,11 +20720,6 @@ packages: engines: {node: '>=10'} dev: true - /type-fest@0.6.0: - resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==} - engines: {node: '>=8'} - dev: true - /type-fest@0.8.1: resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==} engines: {node: '>=8'} @@ -21745,14 +21527,6 @@ packages: resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==} dev: true - /which-pm@2.0.0: - resolution: {integrity: sha512-Lhs9Pmyph0p5n5Z3mVnN0yWcbQYUAD7rbQUiMsQxOJ3T57k7RFe35SUwWMf7dsbDZks1uOmw4AecB/JMDj3v/w==} - engines: {node: '>=8.15'} - dependencies: - load-yaml-file: 0.2.0 - path-exists: 4.0.0 - dev: true - /which-typed-array@1.1.13: resolution: {integrity: sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==} engines: {node: '>= 0.4'} From 79be66aa1eba7953431288083e2cd29ce4d54e8e Mon Sep 17 00:00:00 2001 From: raphaelblum <44967610+raphaelblum@users.noreply.github.com> Date: Fri, 15 Nov 2024 10:34:39 +0100 Subject: [PATCH 022/121] Fix pnpm lockfile (#144) --- pnpm-lock.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 923523e5..5f0b6604 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18936,6 +18936,16 @@ packages: path-type: 3.0.0 dev: true + /read-pkg@5.2.0: + resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==} + engines: {node: '>=8'} + dependencies: + '@types/normalize-package-data': 2.4.4 + normalize-package-data: 2.5.0 + parse-json: 5.2.0 + type-fest: 0.6.0 + dev: true + /read-pkg@7.1.0: resolution: {integrity: sha512-5iOehe+WF75IccPc30bWTbpdDQLOCc3Uu8bi3Dte3Eueij81yx1Mrufk8qBx/YAbR4uL1FdUr+7BKXDwEtisXg==} engines: {node: '>=12.20'} @@ -20720,6 +20730,11 @@ packages: engines: {node: '>=10'} dev: true + /type-fest@0.6.0: + resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==} + engines: {node: '>=8'} + dev: true + /type-fest@0.8.1: resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==} engines: {node: '>=8'} From 5e0e5ab432aeb4ad173995a216e804c385e1d5de Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 10:35:19 +0100 Subject: [PATCH 023/121] Update dotansimha/changesets-action digest to 069996e (#136) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4e6a08e7..8adc1892 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,7 +39,7 @@ jobs: - name: Create Release Pull Request or Publish to npm id: changesets - uses: dotansimha/changesets-action@cbc5ff3569ae9861100a48b290f4e9c1b94e45b5 + uses: dotansimha/changesets-action@069996e9be15531bd598272996fa23853d61590e with: version: pnpm run version publish: pnpm run publish From 15f7b1232c8205e4a29dd80f1785a4065f016bcf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 10:36:52 +0100 Subject: [PATCH 024/121] Update dependency @fast-csv/parse to ^5.0.2 (#142) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/api/package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/api/package.json b/packages/api/package.json index 716f337e..c10146d6 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -26,7 +26,7 @@ "test:watch": "jest --watch" }, "dependencies": { - "@fast-csv/parse": "^5.0.0", + "@fast-csv/parse": "^5.0.2", "@getbrevo/brevo": "^2.2.0", "@nestjs/axios": "^1.0.1", "@nestjs/cache-manager": "^2.3.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5f0b6604..60a9f061 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -919,8 +919,8 @@ importers: packages/api: dependencies: '@fast-csv/parse': - specifier: ^5.0.0 - version: 5.0.0 + specifier: ^5.0.2 + version: 5.0.2 '@getbrevo/brevo': specifier: ^2.2.0 version: 2.2.0 @@ -4489,8 +4489,8 @@ packages: lodash.isundefined: 3.0.1 lodash.uniq: 4.5.0 - /@fast-csv/parse@5.0.0: - resolution: {integrity: sha512-ecF8tCm3jVxeRjEB6VPzmA+1wGaJ5JgaUX2uesOXdXD6qQp0B3EdshOIed4yT1Xlj/F2f8v4zHSo0Oi31L697g==} + /@fast-csv/parse@5.0.2: + resolution: {integrity: sha512-gMu1Btmm99TP+wc0tZnlH30E/F1Gw1Tah3oMDBHNPe9W8S68ixVHjt89Wg5lh7d9RuQMtwN+sGl5kxR891+fzw==} dependencies: lodash.escaperegexp: 4.1.2 lodash.groupby: 4.6.0 From 6bf4751b1e930af5fe1f37c5c5df73d1ee4b59b1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 10:40:34 +0100 Subject: [PATCH 025/121] Update dependency @fontsource-variable/roboto-flex to ^5.1.0 (#143) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index e6b9af63..e75def6f 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -34,7 +34,7 @@ "@comet/cms-admin": "^7.7.0", "@emotion/react": "^11.9.3", "@emotion/styled": "^11.9.3", - "@fontsource-variable/roboto-flex": "^5.0.14", + "@fontsource-variable/roboto-flex": "^5.1.0", "@mui/icons-material": "^5.8.4", "@mui/lab": "^5.0.0-alpha.88", "@mui/material": "^5.8.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 60a9f061..ab0e6b04 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -83,7 +83,7 @@ importers: specifier: ^11.9.3 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 + specifier: ^5.1.0 version: 5.1.0 '@mui/icons-material': specifier: ^5.8.4 From 4fb6b8fd6191ee872f2cdf4c4b30fc6944843283 Mon Sep 17 00:00:00 2001 From: juliawegmayr <109900447+juliawegmayr@users.noreply.github.com> Date: Tue, 19 Nov 2024 08:49:51 +0100 Subject: [PATCH 026/121] COM-1065 Add brevo configuration page (#112) Co-authored-by: Julia Wegmayr --- .changeset/silly-seals-begin.md | 20 ++ README.md | 6 +- demo/admin/src/Routes.tsx | 7 +- demo/admin/src/common/MasterMenu.tsx | 4 + demo/api/schema.gql | 37 ++++ demo/api/src/app.module.ts | 2 - demo/api/src/config/config.ts | 4 - demo/api/src/config/environment-variables.ts | 8 +- demo/campaign/next-env.d.ts | 2 +- demo/site/next-env.d.ts | 2 +- .../brevoConfiguration/BrevoConfigForm.gql.ts | 59 ++++++ .../brevoConfiguration/BrevoConfigForm.tsx | 183 ++++++++++++++++++ .../brevoConfiguration/BrevoConfigPage.tsx | 22 +++ .../emailCampaigns/form/EmailCampaignForm.tsx | 17 +- .../form/SendManagerWrapper.gql.ts | 9 + .../form/SendManagerWrapper.tsx | 43 ++++ packages/admin/src/index.ts | 1 + packages/api/generate-schema.ts | 15 +- packages/api/schema.gql | 61 ++++-- .../brevo-api/brevo-api-campaigns.service.ts | 10 +- .../src/brevo-api/brevo-api-sender.service.ts | 29 +++ .../brevo-api-transactional-mails.service.ts | 16 +- .../api/src/brevo-api/brevo-api.module.ts | 8 +- .../src/brevo-config/brevo-config.module.ts | 25 +++ .../src/brevo-config/brevo-config.resolver.ts | 107 ++++++++++ .../brevo-config/dto/brevo-config.input.ts | 20 ++ .../entities/brevo-config-entity.factory.ts | 60 ++++++ packages/api/src/brevo-module.ts | 8 + .../api/src/config/brevo-module.config.ts | 4 - .../email-campaign/email-campaign.module.ts | 6 +- .../email-campaign/email-campaigns.service.ts | 6 + .../migrations/Migration20241016123307.ts | 9 + .../src/mikro-orm/migrations/migrations.ts | 2 + 33 files changed, 758 insertions(+), 54 deletions(-) create mode 100644 .changeset/silly-seals-begin.md create mode 100644 packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts create mode 100644 packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx create mode 100644 packages/admin/src/brevoConfiguration/BrevoConfigPage.tsx create mode 100644 packages/admin/src/emailCampaigns/form/SendManagerWrapper.gql.ts create mode 100644 packages/admin/src/emailCampaigns/form/SendManagerWrapper.tsx create mode 100644 packages/api/src/brevo-api/brevo-api-sender.service.ts create mode 100644 packages/api/src/brevo-config/brevo-config.module.ts create mode 100644 packages/api/src/brevo-config/brevo-config.resolver.ts create mode 100644 packages/api/src/brevo-config/dto/brevo-config.input.ts create mode 100644 packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts create mode 100644 packages/api/src/mikro-orm/migrations/Migration20241016123307.ts diff --git a/.changeset/silly-seals-begin.md b/.changeset/silly-seals-begin.md new file mode 100644 index 00000000..4237fbb3 --- /dev/null +++ b/.changeset/silly-seals-begin.md @@ -0,0 +1,20 @@ +--- +"@comet/brevo-admin": major +"@comet/brevo-api": minor +--- + +A required brevo config page must now be generated with `createBrevoConfigPage`. +All necessary brevo configuration (for each scope) must be configured within this page for emails campaigns to be sent. + +```diff ++ const BrevoConfigPage = createBrevoConfigPage({ ++ scopeParts: ["domain", "language"], ++ }); +``` + +Env vars containing the brevo sender information can be removed. + +```diff +- BREVO_SENDER_NAME=senderName +- BREVO_SENDER_EMAIL=senderEmail +``` diff --git a/README.md b/README.md index f2d55c4c..d6faf05b 100644 --- a/README.md +++ b/README.md @@ -30,11 +30,13 @@ The following variables must be set manually - `BREVO_API_KEY` - `BREVO_DOUBLE_OPT_IN_TEMPLATE_ID` - `ECG_RTR_LIST_API_KEY` -- `BREVO_SENDER_NAME` -- `BREVO_SENDER_EMAIL` - `CAMPAIGN_BASIC_AUTH_USERNAME` - `CAMPAIGN_BASIC_AUTH_PASSWORD` +### Configure brevo sender in the demo admin brevo config page + +- Brevo sender + ### Start development processes [dev-process-manager](https://github.com/vivid-planet/dev-process-manager) is used for local development. diff --git a/demo/admin/src/Routes.tsx b/demo/admin/src/Routes.tsx index 2e31869a..e6015be8 100644 --- a/demo/admin/src/Routes.tsx +++ b/demo/admin/src/Routes.tsx @@ -1,5 +1,5 @@ import { MasterLayout, RouteWithErrorBoundary } from "@comet/admin"; -import { createBrevoContactsPage, createEmailCampaignsPage, createTargetGroupsPage } from "@comet/brevo-admin"; +import { createBrevoConfigPage, 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"; import { pageTreeCategories, urlParamToCategory } from "@src/pageTree/pageTreeCategories"; @@ -47,6 +47,10 @@ export const Routes: React.FC = () => { EmailCampaignContentBlock: EmailCampaignContentBlock, }); + const BrevoConfigPage = createBrevoConfigPage({ + scopeParts: ["domain", "language"], + }); + return ( {({ match }) => ( @@ -81,6 +85,7 @@ export const Routes: React.FC = () => { + diff --git a/demo/admin/src/common/MasterMenu.tsx b/demo/admin/src/common/MasterMenu.tsx index 5281c6eb..b12d11eb 100644 --- a/demo/admin/src/common/MasterMenu.tsx +++ b/demo/admin/src/common/MasterMenu.tsx @@ -48,6 +48,10 @@ export const MasterMenu: React.FC = () => { primary={intl.formatMessage({ id: "menu.newsletter.emailCampaigns", defaultMessage: "Email campaigns" })} to={`${match.url}/newsletter/email-campaigns`} /> + // NOTE: This file should not be edited -// see https://nextjs.org/docs/basic-features/typescript for more information. +// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information. diff --git a/demo/site/next-env.d.ts b/demo/site/next-env.d.ts index 4f11a03d..a4a7b3f5 100644 --- a/demo/site/next-env.d.ts +++ b/demo/site/next-env.d.ts @@ -2,4 +2,4 @@ /// // NOTE: This file should not be edited -// see https://nextjs.org/docs/basic-features/typescript for more information. +// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information. diff --git a/packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts b/packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts new file mode 100644 index 00000000..a8358e6d --- /dev/null +++ b/packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts @@ -0,0 +1,59 @@ +import { gql } from "@apollo/client"; + +export const brevoConfigFormFragment = gql` + fragment BrevoConfigForm on BrevoConfig { + senderMail + senderName + } +`; + +export const brevoConfigFormQuery = gql` + query BrevoConfigForm($scope: EmailCampaignContentScopeInput!) { + brevoConfig(scope: $scope) { + id + updatedAt + ...BrevoConfigForm + } + } + ${brevoConfigFormFragment} +`; + +export const brevoConfigFormCheckForChangesQuery = gql` + query BrevoConfigFormCheckForChanges($scope: EmailCampaignContentScopeInput!) { + brevoConfig(scope: $scope) { + updatedAt + } + } +`; + +export const createBrevoConfigMutation = gql` + mutation CreateBrevoConfig($scope: EmailCampaignContentScopeInput!, $input: BrevoConfigInput!) { + createBrevoConfig(scope: $scope, input: $input) { + id + updatedAt + ...BrevoConfigForm + } + } + ${brevoConfigFormFragment} +`; + +export const updateBrevoConfigMutation = gql` + mutation UpdateBrevoConfig($id: ID!, $input: BrevoConfigUpdateInput!, $lastUpdatedAt: DateTime) { + updateBrevoConfig(id: $id, input: $input, lastUpdatedAt: $lastUpdatedAt) { + id + updatedAt + ...BrevoConfigForm + } + } + ${brevoConfigFormFragment} +`; + +export const sendersSelectQuery = gql` + query SendersSelect($scope: EmailCampaignContentScopeInput!) { + senders(scope: $scope) { + id + name + email + } + } +`; diff --git a/packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx b/packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx new file mode 100644 index 00000000..9210b2b3 --- /dev/null +++ b/packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx @@ -0,0 +1,183 @@ +import { gql, useApolloClient, useQuery } from "@apollo/client"; +import { + Field, + FinalForm, + FinalFormAutocomplete, + FinalFormSaveSplitButton, + FinalFormSubmitEvent, + Loading, + MainContent, + Toolbar, + ToolbarActions, + ToolbarFillSpace, + ToolbarTitleItem, + useFormApiRef, + useStackSwitchApi, +} from "@comet/admin"; +import { ContentScopeIndicator, ContentScopeInterface, resolveHasSaveConflict, useFormSaveConflict } from "@comet/cms-admin"; +import { FormApi } from "final-form"; +import React from "react"; +import { FormattedMessage } from "react-intl"; + +import { brevoConfigFormQuery, createBrevoConfigMutation, sendersSelectQuery, updateBrevoConfigMutation } from "./BrevoConfigForm.gql"; +import { + GQLBrevoConfigFormQuery, + GQLBrevoConfigFormQueryVariables, + GQLCreateBrevoConfigMutation, + GQLCreateBrevoConfigMutationVariables, + GQLSendersSelectQuery, + GQLSendersSelectQueryVariables, + GQLUpdateBrevoConfigMutation, + GQLUpdateBrevoConfigMutationVariables, +} from "./BrevoConfigForm.gql.generated"; + +interface Option { + value: string; + label: string; +} +type FormValues = { + sender: Option; +}; + +interface FormProps { + scope: ContentScopeInterface; +} + +export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { + const client = useApolloClient(); + const formApiRef = useFormApiRef(); + const stackSwitchApi = useStackSwitchApi(); + + const { data, error, loading, refetch } = useQuery(brevoConfigFormQuery, { + variables: { scope }, + }); + + const { + data: sendersData, + error: senderError, + loading: senderLoading, + } = useQuery(sendersSelectQuery, { + variables: { scope }, + }); + + const senderOptions = + sendersData?.senders?.map((sender) => ({ + value: sender.email, + label: `${sender.name} (${sender.email})`, + })) ?? []; + + const mode = data?.brevoConfig?.id ? "edit" : "add"; + + const initialValues = React.useMemo>(() => { + const sender = sendersData?.senders?.find((s) => s.email === data?.brevoConfig?.senderMail && s.name === data?.brevoConfig?.senderName); + return sender + ? { + sender: { + value: sender.id, + label: `${sender.name} (${sender.email})`, + }, + } + : {}; + }, [data?.brevoConfig?.senderMail, data?.brevoConfig?.senderName, sendersData?.senders]); + + const saveConflict = useFormSaveConflict({ + checkConflict: async () => { + const query = gql` + query ($scope: EmailCampaignContentScopeInput!) { + brevoConfig(scope: $scope) { + updatedAt + } + } + `; + const { data } = await client.query({ + query, + variables: { scope }, + fetchPolicy: "no-cache", + }); + + return resolveHasSaveConflict(data?.brevoConfig?.updatedAt, data.updatedAt); + }, + formApiRef, + loadLatestVersion: async () => { + await refetch(); + }, + }); + + const handleSubmit = async (state: FormValues, form: FormApi, event: FinalFormSubmitEvent) => { + if (await saveConflict.checkForConflicts()) { + throw new Error("Conflicts detected"); + } + + const sender = sendersData?.senders?.find((s) => s.email === state.sender.value); + + if (!sender) { + throw new Error("No sender selected"); + } + + const output = { + senderName: sender?.name, + senderMail: sender?.email, + }; + + if (mode === "edit") { + if (!data?.brevoConfig?.id) { + throw new Error("Missing id in edit mode"); + } + await client.mutate({ + mutation: updateBrevoConfigMutation, + variables: { id: data?.brevoConfig?.id, input: output, lastUpdatedAt: data?.brevoConfig?.updatedAt }, + }); + } else { + const { data: mutationResponse } = await client.mutate({ + mutation: createBrevoConfigMutation, + variables: { scope, input: output }, + }); + if (!event.navigatingBack) { + const id = mutationResponse?.createBrevoConfig.id; + if (id) { + setTimeout(() => { + stackSwitchApi.activatePage("edit", id); + }); + } + } + } + }; + + if (error || senderError) throw error ?? senderError; + + if (loading || senderLoading) { + return ; + } + + return ( + apiRef={formApiRef} onSubmit={handleSubmit} mode={mode} initialValues={initialValues}> + {({ values }) => { + return ( + <> + {saveConflict.dialogs} + }> + + + + + + + + + + option.label} + isOptionEqualToValue={(option: Option, value: Option) => option.value === value.value} + options={senderOptions} + name="sender" + label={} + fullWidth + /> + + + ); + }} + + ); +} diff --git a/packages/admin/src/brevoConfiguration/BrevoConfigPage.tsx b/packages/admin/src/brevoConfiguration/BrevoConfigPage.tsx new file mode 100644 index 00000000..f8c8163b --- /dev/null +++ b/packages/admin/src/brevoConfiguration/BrevoConfigPage.tsx @@ -0,0 +1,22 @@ +import { useContentScope } from "@comet/cms-admin"; +import * as React from "react"; + +import { BrevoConfigForm } from "./BrevoConfigForm"; + +interface CreateBrevoConfigPageOptions { + scopeParts: string[]; +} + +export function createBrevoConfigPage({ scopeParts }: CreateBrevoConfigPageOptions) { + function BrevoConfigPage(): JSX.Element { + const { scope: completeScope } = useContentScope(); + + const scope = scopeParts.reduce((acc, scopePart) => { + acc[scopePart] = completeScope[scopePart]; + return acc; + }, {} as { [key: string]: unknown }); + + return ; + } + return BrevoConfigPage; +} diff --git a/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx b/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx index 390de493..df9cdee7 100644 --- a/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx +++ b/packages/admin/src/emailCampaigns/form/EmailCampaignForm.tsx @@ -54,6 +54,7 @@ import { GQLUpdateEmailCampaignMutationVariables, } from "./EmailCampaignForm.gql.generated"; import { SendManagerFields } from "./SendManagerFields"; +import { SendManagerWrapper } from "./SendManagerWrapper"; import { TestEmailCampaignForm } from "./TestEmailCampaignForm"; interface FormProps { @@ -293,13 +294,15 @@ export function EmailCampaignForm({ id, EmailCampaignContentBlock, scope }: Form scheduledAt: state.scheduledAt, }} > - - + + + + ), }, diff --git a/packages/admin/src/emailCampaigns/form/SendManagerWrapper.gql.ts b/packages/admin/src/emailCampaigns/form/SendManagerWrapper.gql.ts new file mode 100644 index 00000000..720e9444 --- /dev/null +++ b/packages/admin/src/emailCampaigns/form/SendManagerWrapper.gql.ts @@ -0,0 +1,9 @@ +import { gql } from "@apollo/client"; + +export const brevoConfigQuery = gql` + query BrevoConfig($scope: EmailCampaignContentScopeInput!) { + brevoConfig(scope: $scope) { + id + } + } +`; diff --git a/packages/admin/src/emailCampaigns/form/SendManagerWrapper.tsx b/packages/admin/src/emailCampaigns/form/SendManagerWrapper.tsx new file mode 100644 index 00000000..511e5519 --- /dev/null +++ b/packages/admin/src/emailCampaigns/form/SendManagerWrapper.tsx @@ -0,0 +1,43 @@ +import { useQuery } from "@apollo/client"; +import { Loading } from "@comet/admin"; +import { ContentScopeInterface } from "@comet/cms-admin"; +import { Typography } from "@mui/material"; +import * as React from "react"; +import { FormattedMessage } from "react-intl"; + +import { brevoConfigQuery } from "./SendManagerWrapper.gql"; +import { GQLBrevoConfigQuery, GQLBrevoConfigQueryVariables } from "./SendManagerWrapper.gql.generated"; + +interface SendManagerWrapperProps { + scope: ContentScopeInterface; +} + +export const SendManagerWrapper = ({ scope, children }: React.PropsWithChildren) => { + const { + data: brevoConfig, + loading, + error, + } = useQuery(brevoConfigQuery, { + variables: { scope }, + fetchPolicy: "network-only", + }); + + if (loading) { + return ; + } + + if (error) throw error; + + if (brevoConfig?.brevoConfig?.id == undefined) { + return ( + + + + ); + } + + return <> {children} ; +}; diff --git a/packages/admin/src/index.ts b/packages/admin/src/index.ts index abf8d740..88a73291 100644 --- a/packages/admin/src/index.ts +++ b/packages/admin/src/index.ts @@ -1,3 +1,4 @@ +export { createBrevoConfigPage } from "./brevoConfiguration/BrevoConfigPage"; export { createBrevoContactsPage } from "./brevoContacts/BrevoContactsPage"; export { EditBrevoContactFormValues } from "./brevoContacts/form/BrevoContactForm"; export { BrevoConfig, BrevoConfigProvider, useBrevoConfig } from "./common/BrevoConfigProvider"; diff --git a/packages/api/generate-schema.ts b/packages/api/generate-schema.ts index 46c4bb1e..ccbb39d9 100644 --- a/packages/api/generate-schema.ts +++ b/packages/api/generate-schema.ts @@ -6,6 +6,8 @@ import { Field, GraphQLSchemaBuilderModule, GraphQLSchemaFactory, InputType, Obj import { writeFile } from "fs/promises"; import { printSchema } from "graphql"; +import { createBrevoConfigResolver } from "./src/brevo-config/brevo-config.resolver"; +import { BrevoConfigEntityFactory } from "./src/brevo-config/entities/brevo-config-entity.factory"; import { createBrevoContactResolver } from "./src/brevo-contact/brevo-contact.resolver"; import { createBrevoContactImportResolver } from "./src/brevo-contact/brevo-contact-import.resolver"; import { BrevoContactFactory } from "./src/brevo-contact/dto/brevo-contact.factory"; @@ -89,8 +91,19 @@ async function generateSchema(): Promise { Scope: EmailCampaignScope, }); - const schema = await gqlSchemaFactory.create([BrevoContactResolver, TargetGroupResolver, EmailCampaignResolver, BrevoContactImportResolver]); + const BrevoConfig = BrevoConfigEntityFactory.create({ Scope: EmailCampaignScope }); + const BrevoConfigResolver = createBrevoConfigResolver({ + BrevoConfig, + Scope: EmailCampaignScope, + }); + const schema = await gqlSchemaFactory.create([ + BrevoContactResolver, + TargetGroupResolver, + EmailCampaignResolver, + BrevoContactImportResolver, + BrevoConfigResolver, + ]); await writeFile("schema.gql", printSchema(schema)); console.log("Done!"); diff --git a/packages/api/schema.gql b/packages/api/schema.gql index b3c01c02..4b82caaf 100644 --- a/packages/api/schema.gql +++ b/packages/api/schema.gql @@ -8,6 +8,18 @@ The `JSONObject` scalar type represents JSON objects as specified by [ECMA-404]( """ scalar JSONObject @specifiedBy(url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf") +type Dependency { + rootId: String! + rootGraphqlObjectType: String! + rootColumnName: String! + jsonPath: String! + visible: Boolean! + targetGraphqlObjectType: String! + targetId: String! + name: String + secondaryInformation: String +} + type ImageCropArea { focalPoint: FocalPoint! width: Float @@ -25,24 +37,26 @@ enum FocalPoint { SOUTHEAST } -type Dependency { - rootId: String! - rootGraphqlObjectType: String! - rootColumnName: String! - jsonPath: String! - visible: Boolean! - targetGraphqlObjectType: String! - targetId: String! - name: String - secondaryInformation: String -} - type User { id: String! name: String! email: String! } +type BrevoApiSender { + id: ID! + name: String! + email: String! + active: Boolean! + ips: [BrevoIp!] +} + +type BrevoIp { + ip: String! + domain: String! + weight: Int! +} + type CsvImportInformation { created: Int! updated: Int! @@ -166,6 +180,15 @@ type PaginatedEmailCampaigns { totalCount: Int! } +type BrevoConfig implements DocumentInterface { + id: ID! + updatedAt: DateTime! + senderMail: String! + senderName: String! + createdAt: DateTime! + scope: EmailCampaignContentScope! +} + input EmailCampaignContentScopeInput { thisScopeHasNoFields____: String } @@ -179,6 +202,8 @@ type Query { emailCampaign(id: ID!): EmailCampaign! emailCampaigns(scope: EmailCampaignContentScopeInput!, search: String, filter: EmailCampaignFilter, sort: [EmailCampaignSort!], offset: Int! = 0, limit: Int! = 25): PaginatedEmailCampaigns! emailCampaignStatistics(id: ID!): BrevoApiCampaignStatistics + senders(scope: EmailCampaignContentScopeInput!): [BrevoApiSender!] + brevoConfig(scope: EmailCampaignContentScopeInput!): BrevoConfig } input TargetGroupFilter { @@ -261,6 +286,8 @@ type Mutation { sendEmailCampaignNow(id: ID!): Boolean! sendEmailCampaignToTestEmails(id: ID!, data: SendTestEmailCampaignArgs!): Boolean! startBrevoContactImport(fileId: ID!, targetGroupIds: [ID!], scope: EmailCampaignContentScopeInput!): CsvImportInformation! + createBrevoConfig(scope: EmailCampaignContentScopeInput!, input: BrevoConfigInput!): BrevoConfig! + updateBrevoConfig(id: ID!, input: BrevoConfigUpdateInput!, lastUpdatedAt: DateTime): BrevoConfig! } input BrevoContactUpdateInput { @@ -328,3 +355,13 @@ input EmailCampaignUpdateInput { input SendTestEmailCampaignArgs { emails: [String!]! } + +input BrevoConfigInput { + senderMail: String! + senderName: String! +} + +input BrevoConfigUpdateInput { + senderMail: String + senderName: String +} diff --git a/packages/api/src/brevo-api/brevo-api-campaigns.service.ts b/packages/api/src/brevo-api/brevo-api-campaigns.service.ts index e171fd03..f1d8dab5 100644 --- a/packages/api/src/brevo-api/brevo-api-campaigns.service.ts +++ b/packages/api/src/brevo-api/brevo-api-campaigns.service.ts @@ -57,20 +57,21 @@ export class BrevoApiCampaignsService { public async createBrevoCampaign({ campaign, htmlContent, + sender, scheduledAt, }: { campaign: EmailCampaignInterface; htmlContent: string; + sender: { name: string; mail: string }; scheduledAt?: Date; }): Promise { try { const targetGroups = await campaign.targetGroups.loadItems(); - const { sender } = this.config.brevo.resolveConfig(campaign.scope); const emailCampaign = { name: campaign.title, subject: campaign.subject, - sender: { name: sender.name, email: sender.email }, + sender: { name: sender.name, email: sender.mail }, recipients: { listIds: targetGroups.map((targetGroup) => targetGroup.brevoId) }, htmlContent, scheduledAt: scheduledAt?.toISOString(), @@ -87,21 +88,22 @@ export class BrevoApiCampaignsService { id, campaign, htmlContent, + sender, scheduledAt, }: { id: number; campaign: EmailCampaignInterface; htmlContent: string; + sender: { name: string; mail: string }; scheduledAt?: Date; }): Promise { try { const targetGroups = await campaign.targetGroups.loadItems(); - const { sender } = this.config.brevo.resolveConfig(campaign.scope); const emailCampaign = { name: campaign.title, subject: campaign.subject, - sender: { name: sender.name, mail: sender.email }, + sender: { name: sender.name, email: sender.mail }, recipients: { listIds: targetGroups.map((targetGroup) => targetGroup.brevoId) }, htmlContent, scheduledAt: scheduledAt?.toISOString(), diff --git a/packages/api/src/brevo-api/brevo-api-sender.service.ts b/packages/api/src/brevo-api/brevo-api-sender.service.ts new file mode 100644 index 00000000..5d20289b --- /dev/null +++ b/packages/api/src/brevo-api/brevo-api-sender.service.ts @@ -0,0 +1,29 @@ +import * as Brevo from "@getbrevo/brevo"; +import { Inject, Injectable } from "@nestjs/common"; +import { EmailCampaignScopeInterface } from "src/types"; + +import { BrevoModuleConfig } from "../config/brevo-module.config"; +import { BREVO_MODULE_CONFIG } from "../config/brevo-module.constants"; +import { BrevoApiSender } from "./dto/brevo-api-sender"; + +@Injectable() +export class BrevoApiSenderService { + private readonly senderApi: Brevo.SendersApi; + + constructor(@Inject(BREVO_MODULE_CONFIG) private readonly config: BrevoModuleConfig) { + this.senderApi = new Brevo.SendersApi(); + } + + public async getSenders(scope: EmailCampaignScopeInterface): Promise | undefined> { + const apiKey = this.config.brevo.resolveConfig(scope).apiKey; + this.senderApi.setApiKey(Brevo.SendersApiApiKeys.apiKey, apiKey); + + const { response, body } = await this.senderApi.getSenders(); + + if (response.statusCode !== 200) { + throw new Error("Failed to get senders"); + } + + return body.senders as BrevoApiSender[]; + } +} diff --git a/packages/api/src/brevo-api/brevo-api-transactional-mails.service.ts b/packages/api/src/brevo-api/brevo-api-transactional-mails.service.ts index 2e1873d2..dd12cb40 100644 --- a/packages/api/src/brevo-api/brevo-api-transactional-mails.service.ts +++ b/packages/api/src/brevo-api/brevo-api-transactional-mails.service.ts @@ -1,5 +1,8 @@ import * as Brevo from "@getbrevo/brevo"; +import { EntityRepository } from "@mikro-orm/core"; +import { InjectRepository } from "@mikro-orm/nestjs"; import { Inject, Injectable } from "@nestjs/common"; +import { BrevoConfigInterface } from "src/brevo-config/entities/brevo-config-entity.factory"; import { EmailCampaignScopeInterface } from "src/types"; import { BrevoModuleConfig } from "../config/brevo-module.config"; @@ -12,7 +15,10 @@ type SendTransacEmailResponse = ReturnType(); - constructor(@Inject(BREVO_MODULE_CONFIG) private readonly config: BrevoModuleConfig) {} + constructor( + @Inject(BREVO_MODULE_CONFIG) private readonly config: BrevoModuleConfig, + @InjectRepository("BrevoConfig") private readonly brevoConfigRepository: EntityRepository, + ) {} private getTransactionalEmailsApi(scope: EmailCampaignScopeInterface): Brevo.TransactionalEmailsApi { try { @@ -36,8 +42,12 @@ export class BrevoTransactionalMailsService { async send(options: Omit, scope: EmailCampaignScopeInterface): SendTransacEmailResponse { try { - const config = this.config.brevo.resolveConfig(scope); - return this.getTransactionalEmailsApi(scope).sendTransacEmail({ ...options, sender: config.sender }); + const brevoConfig = await this.brevoConfigRepository.findOneOrFail({ scope }); + + return this.getTransactionalEmailsApi(scope).sendTransacEmail({ + ...options, + sender: { name: brevoConfig.senderName, email: brevoConfig.senderMail }, + }); } catch (error) { handleBrevoError(error); } diff --git a/packages/api/src/brevo-api/brevo-api.module.ts b/packages/api/src/brevo-api/brevo-api.module.ts index 28c3f952..5ee4542b 100644 --- a/packages/api/src/brevo-api/brevo-api.module.ts +++ b/packages/api/src/brevo-api/brevo-api.module.ts @@ -1,14 +1,16 @@ +import { MikroOrmModule } from "@mikro-orm/nestjs"; import { CacheModule } from "@nestjs/cache-manager"; import { Module } from "@nestjs/common"; import { ConfigModule } from "../config/config.module"; import { BrevoApiCampaignsService } from "./brevo-api-campaigns.service"; import { BrevoApiContactsService } from "./brevo-api-contact.service"; +import { BrevoApiSenderService } from "./brevo-api-sender.service"; import { BrevoTransactionalMailsService } from "./brevo-api-transactional-mails.service"; @Module({ - imports: [ConfigModule, CacheModule.register({ ttl: 1000 * 60 })], - providers: [BrevoApiContactsService, BrevoApiCampaignsService, BrevoTransactionalMailsService], - exports: [BrevoApiContactsService, BrevoApiCampaignsService, BrevoTransactionalMailsService], + imports: [ConfigModule, CacheModule.register({ ttl: 1000 * 60 }), MikroOrmModule.forFeature(["BrevoConfig"])], + providers: [BrevoApiContactsService, BrevoApiCampaignsService, BrevoTransactionalMailsService, BrevoApiSenderService], + exports: [BrevoApiContactsService, BrevoApiCampaignsService, BrevoTransactionalMailsService, BrevoApiSenderService], }) export class BrevoApiModule {} diff --git a/packages/api/src/brevo-config/brevo-config.module.ts b/packages/api/src/brevo-config/brevo-config.module.ts new file mode 100644 index 00000000..aa3363af --- /dev/null +++ b/packages/api/src/brevo-config/brevo-config.module.ts @@ -0,0 +1,25 @@ +import { MikroOrmModule } from "@mikro-orm/nestjs"; +import { DynamicModule, Module, Type } from "@nestjs/common"; + +import { BrevoApiModule } from "../brevo-api/brevo-api.module"; +import { EmailCampaignScopeInterface } from "../types"; +import { createBrevoConfigResolver } from "./brevo-config.resolver"; +import { BrevoConfigInterface } from "./entities/brevo-config-entity.factory"; + +interface BrevoConfigModuleConfig { + Scope: Type; + BrevoConfig: Type; +} + +@Module({}) +export class BrevoConfigModule { + static register({ Scope, BrevoConfig }: BrevoConfigModuleConfig): DynamicModule { + const BrevoConfigResolver = createBrevoConfigResolver({ BrevoConfig, Scope }); + + return { + module: BrevoConfigModule, + imports: [MikroOrmModule.forFeature([BrevoConfig]), BrevoApiModule], + providers: [BrevoConfigResolver], + }; + } +} diff --git a/packages/api/src/brevo-config/brevo-config.resolver.ts b/packages/api/src/brevo-config/brevo-config.resolver.ts new file mode 100644 index 00000000..07ec220e --- /dev/null +++ b/packages/api/src/brevo-config/brevo-config.resolver.ts @@ -0,0 +1,107 @@ +import { AffectedEntity, RequiredPermission, validateNotModified } from "@comet/cms-api"; +import { EntityManager, EntityRepository, wrap } from "@mikro-orm/core"; +import { InjectRepository } from "@mikro-orm/nestjs"; +import { Type } from "@nestjs/common"; +import { Args, ID, Mutation, Query, Resolver } from "@nestjs/graphql"; + +import { BrevoApiSenderService } from "../brevo-api/brevo-api-sender.service"; +import { BrevoApiSender } from "../brevo-api/dto/brevo-api-sender"; +import { EmailCampaignScopeInterface } from "../types"; +import { DynamicDtoValidationPipe } from "../validation/dynamic-dto-validation.pipe"; +import { BrevoConfigInput, BrevoConfigUpdateInput } from "./dto/brevo-config.input"; +import { BrevoConfigInterface } from "./entities/brevo-config-entity.factory"; + +export function createBrevoConfigResolver({ + Scope, + BrevoConfig, +}: { + Scope: Type; + BrevoConfig: Type; +}): Type { + @Resolver(() => BrevoConfig) + @RequiredPermission(["brevo-newsletter-config"]) + class BrevoConfigResolver { + constructor( + private readonly entityManager: EntityManager, + private readonly brevoSenderApiService: BrevoApiSenderService, + @InjectRepository(BrevoConfig) private readonly repository: EntityRepository, + ) {} + + private async isValidSender({ email, name }: { email: string; name: string }): Promise { + const senders = await this.brevoSenderApiService.getSenders(Scope); + + if (senders && senders.some((sender) => sender.email === email && sender.name === name)) { + return true; + } + + return false; + } + + @Query(() => [BrevoApiSender], { nullable: true }) + async senders( + @Args("scope", { type: () => Scope }, new DynamicDtoValidationPipe(Scope)) + scope: typeof Scope, + ): Promise | undefined> { + const senders = await this.brevoSenderApiService.getSenders(scope); + return senders; + } + + @Query(() => BrevoConfig, { nullable: true }) + async brevoConfig( + @Args("scope", { type: () => Scope }, new DynamicDtoValidationPipe(Scope)) + scope: typeof Scope, + ): Promise { + const brevoConfig = await this.repository.findOne({ scope }); + return brevoConfig; + } + + @Mutation(() => BrevoConfig) + async createBrevoConfig( + @Args("scope", { type: () => Scope }, new DynamicDtoValidationPipe(Scope)) + scope: typeof Scope, + @Args("input", { type: () => BrevoConfigInput }) input: BrevoConfigInput, + ): Promise { + if (!(await this.isValidSender({ email: input.senderMail, name: input.senderName }))) { + throw new Error("Sender not found"); + } + + const brevoConfig = this.repository.create({ + ...input, + scope, + }); + + await this.entityManager.flush(); + + return brevoConfig; + } + + @Mutation(() => BrevoConfig) + @AffectedEntity(BrevoConfig) + async updateBrevoConfig( + @Args("id", { type: () => ID }) id: string, + @Args("input", { type: () => BrevoConfigUpdateInput }) input: BrevoConfigUpdateInput, + @Args("lastUpdatedAt", { type: () => Date, nullable: true }) lastUpdatedAt?: Date, + ): Promise { + const brevoConfig = await this.repository.findOneOrFail(id); + if (input.senderMail && input.senderName) { + if (!(await this.isValidSender({ email: input.senderMail, name: input.senderName }))) { + throw new Error("Sender not found"); + } + } + + if (lastUpdatedAt) { + validateNotModified(brevoConfig, lastUpdatedAt); + } + + wrap(brevoConfig).assign({ + ...input, + }); + + await this.entityManager.flush(); + + return brevoConfig; + } + } + + return BrevoConfigResolver; +} diff --git a/packages/api/src/brevo-config/dto/brevo-config.input.ts b/packages/api/src/brevo-config/dto/brevo-config.input.ts new file mode 100644 index 00000000..1ceffdc5 --- /dev/null +++ b/packages/api/src/brevo-config/dto/brevo-config.input.ts @@ -0,0 +1,20 @@ +import { PartialType } from "@comet/cms-api"; +import { Field, InputType } from "@nestjs/graphql"; +import { IsEmail, IsNotEmpty, IsString } from "class-validator"; + +@InputType() +export class BrevoConfigInput { + @IsNotEmpty() + @IsString() + @Field() + @IsEmail() + senderMail: string; + + @IsNotEmpty() + @IsString() + @Field() + senderName: string; +} + +@InputType() +export class BrevoConfigUpdateInput extends PartialType(BrevoConfigInput) {} diff --git a/packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts b/packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts new file mode 100644 index 00000000..57bd5fdd --- /dev/null +++ b/packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts @@ -0,0 +1,60 @@ +import { DocumentInterface } from "@comet/cms-api"; +import { Embedded, Entity, OptionalProps, PrimaryKey, Property } from "@mikro-orm/core"; +import { Type } from "@nestjs/common"; +import { Field, ID, ObjectType } from "@nestjs/graphql"; +import { v4 } from "uuid"; + +import { EmailCampaignScopeInterface } from "../../types"; + +export interface BrevoConfigInterface { + [OptionalProps]?: "createdAt" | "updatedAt"; + id: string; + senderName: string; + senderMail: string; + createdAt: Date; + updatedAt: Date; + scope: EmailCampaignScopeInterface; +} + +export class BrevoConfigEntityFactory { + static create({ Scope }: { Scope: EmailCampaignScopeInterface }): Type { + @Entity() + @ObjectType({ + implements: () => [DocumentInterface], + }) + class BrevoConfig implements BrevoConfigInterface, DocumentInterface { + [OptionalProps]?: "createdAt" | "updatedAt"; + + @PrimaryKey({ columnType: "uuid" }) + @Field(() => ID) + id: string = v4(); + + @Property({ columnType: "text" }) + @Field() + senderMail: string; + + @Property({ columnType: "text" }) + @Field() + senderName: string; + + @Property({ + columnType: "timestamp with time zone", + }) + @Field() + createdAt: Date = new Date(); + + @Property({ + columnType: "timestamp with time zone", + onUpdate: () => new Date(), + }) + @Field() + updatedAt: Date = new Date(); + + @Embedded(() => Scope) + @Field(() => Scope) + scope: typeof Scope; + } + + return BrevoConfig; + } +} diff --git a/packages/api/src/brevo-module.ts b/packages/api/src/brevo-module.ts index 171263c3..9a2dd7c6 100644 --- a/packages/api/src/brevo-module.ts +++ b/packages/api/src/brevo-module.ts @@ -5,6 +5,8 @@ import { DynamicModule, Global, Module, Optional } from "@nestjs/common"; import { ModuleRef } from "@nestjs/core"; import { BrevoApiModule } from "./brevo-api/brevo-api.module"; +import { BrevoConfigModule } from "./brevo-config/brevo-config.module"; +import { BrevoConfigEntityFactory } from "./brevo-config/entities/brevo-config-entity.factory"; import { BrevoContactModule } from "./brevo-contact/brevo-contact.module"; import { BrevoModuleConfig } from "./config/brevo-module.config"; import { ConfigModule } from "./config/config.module"; @@ -33,6 +35,10 @@ export class BrevoModule { BrevoFilterAttributes: config.brevo.BrevoContactFilterAttributes, }); + const BrevoConfig = BrevoConfigEntityFactory.create({ + Scope: config.emailCampaigns.Scope, + }); + return { module: BrevoModule, imports: [ @@ -46,12 +52,14 @@ export class BrevoModule { EmailCampaignContentBlock: config.emailCampaigns.EmailCampaignContentBlock, Scope: config.emailCampaigns.Scope, TargetGroup, + BrevoConfig, }), TargetGroupModule.register({ Scope: config.emailCampaigns.Scope, BrevoFilterAttributes: config.brevo.BrevoContactFilterAttributes, TargetGroup: TargetGroup, }), + BrevoConfigModule.register({ BrevoConfig, Scope: config.emailCampaigns.Scope }), ConfigModule.forRoot(config), ], exports: [TargetGroupModule, BrevoContactModule, BrevoApiModule], diff --git a/packages/api/src/config/brevo-module.config.ts b/packages/api/src/config/brevo-module.config.ts index e1de61f7..e11995da 100644 --- a/packages/api/src/config/brevo-module.config.ts +++ b/packages/api/src/config/brevo-module.config.ts @@ -9,10 +9,6 @@ export interface BrevoModuleConfig { resolveConfig: (scope: EmailCampaignScopeInterface) => { apiKey: string; doubleOptInTemplateId: number; - sender: { - name: string; - email: string; - }; allowedRedirectUrl: string; redirectUrlForImport: string; }; diff --git a/packages/api/src/email-campaign/email-campaign.module.ts b/packages/api/src/email-campaign/email-campaign.module.ts index 4d1ed54b..b130633d 100644 --- a/packages/api/src/email-campaign/email-campaign.module.ts +++ b/packages/api/src/email-campaign/email-campaign.module.ts @@ -2,6 +2,7 @@ import { Block } from "@comet/blocks-api"; import { MikroOrmModule } from "@mikro-orm/nestjs"; import { HttpModule } from "@nestjs/axios"; import { DynamicModule, Module, Type } from "@nestjs/common"; +import { BrevoConfigInterface } from "src/brevo-config/entities/brevo-config-entity.factory"; import { TargetGroupInterface } from "src/target-group/entity/target-group-entity.factory"; import { BrevoApiModule } from "../brevo-api/brevo-api.module"; @@ -17,11 +18,12 @@ interface EmailCampaignModuleConfig { Scope: Type; EmailCampaignContentBlock: Block; TargetGroup: Type; + BrevoConfig: Type; } @Module({}) export class EmailCampaignModule { - static register({ Scope, EmailCampaignContentBlock, TargetGroup }: EmailCampaignModuleConfig): DynamicModule { + static register({ Scope, EmailCampaignContentBlock, TargetGroup, BrevoConfig }: EmailCampaignModuleConfig): DynamicModule { const EmailCampaign = EmailCampaignEntityFactory.create({ Scope, EmailCampaignContentBlock, @@ -44,7 +46,7 @@ export class EmailCampaignModule { HttpModule.register({ timeout: 5000, }), - MikroOrmModule.forFeature([EmailCampaign, TargetGroup]), + MikroOrmModule.forFeature([EmailCampaign, TargetGroup, BrevoConfig]), ], providers: [EmailCampaignsResolver, EmailCampaignsService, EcgRtrListService], }; diff --git a/packages/api/src/email-campaign/email-campaigns.service.ts b/packages/api/src/email-campaign/email-campaigns.service.ts index 5c90f732..d1d870ed 100644 --- a/packages/api/src/email-campaign/email-campaigns.service.ts +++ b/packages/api/src/email-campaign/email-campaigns.service.ts @@ -4,6 +4,7 @@ import { EntityManager, EntityRepository, ObjectQuery, wrap } from "@mikro-orm/c import { InjectRepository } from "@mikro-orm/nestjs"; import { HttpService } from "@nestjs/axios"; import { Inject, Injectable } from "@nestjs/common"; +import { BrevoConfigInterface } from "src/brevo-config/entities/brevo-config-entity.factory"; import { EmailCampaignScopeInterface } from "src/types"; import { BrevoApiCampaignsService } from "../brevo-api/brevo-api-campaigns.service"; @@ -20,6 +21,7 @@ export class EmailCampaignsService { constructor( @Inject(BREVO_MODULE_CONFIG) private readonly config: BrevoModuleConfig, @InjectRepository("EmailCampaign") private readonly repository: EntityRepository, + @InjectRepository("BrevoConfig") private readonly brevoConfigRepository: EntityRepository, private readonly httpService: HttpService, private readonly brevoApiCampaignService: BrevoApiCampaignsService, private readonly brevoApiContactsService: BrevoApiContactsService, @@ -45,6 +47,8 @@ export class EmailCampaignsService { async saveEmailCampaignInBrevo(campaign: EmailCampaignInterface, scheduledAt?: Date): Promise { const content = await this.blockTransformerService.transformToPlain(campaign.content); + const brevoConfig = await this.brevoConfigRepository.findOneOrFail({ scope: campaign.scope }); + const { data: htmlContent, status } = await this.httpService.axiosRef.post( this.config.emailCampaigns.frontend.url, { id: campaign.id, title: campaign.title, content, scope: campaign.scope }, @@ -66,6 +70,7 @@ export class EmailCampaignsService { brevoId = await this.brevoApiCampaignService.createBrevoCampaign({ campaign, htmlContent, + sender: { name: brevoConfig.senderName, mail: brevoConfig.senderMail }, scheduledAt, }); @@ -77,6 +82,7 @@ export class EmailCampaignsService { id: brevoId, campaign, htmlContent, + sender: { name: brevoConfig.senderName, mail: brevoConfig.senderMail }, scheduledAt, }); } diff --git a/packages/api/src/mikro-orm/migrations/Migration20241016123307.ts b/packages/api/src/mikro-orm/migrations/Migration20241016123307.ts new file mode 100644 index 00000000..bfea141d --- /dev/null +++ b/packages/api/src/mikro-orm/migrations/Migration20241016123307.ts @@ -0,0 +1,9 @@ +import { Migration } from "@mikro-orm/migrations"; + +export class Migration20241016123307 extends Migration { + async up(): Promise { + this.addSql( + 'create table "BrevoConfig" ("id" uuid not null, "createdAt" timestamp with time zone not null, "updatedAt" timestamp with time zone not null, "scope_domain" text not null, "scope_language" text not null, "senderMail" text not null, "senderName" text not null, constraint "BrevoConfig_pkey" primary key ("id"));', + ); + } +} diff --git a/packages/api/src/mikro-orm/migrations/migrations.ts b/packages/api/src/mikro-orm/migrations/migrations.ts index f3282bdf..688bdfe3 100644 --- a/packages/api/src/mikro-orm/migrations/migrations.ts +++ b/packages/api/src/mikro-orm/migrations/migrations.ts @@ -8,6 +8,7 @@ import { Migration20240619092554 } from "./Migration20240619092554"; import { Migration20240619145217 } from "./Migration20240619145217"; import { Migration20240621102349 } from "./Migration20240621102349"; import { Migration20240819214939 } from "./Migration20240819214939"; +import { Migration20241016123307 } from "./Migration20241016123307"; export const migrationsList: MigrationObject[] = [ { name: "Migration20240115095733", class: Migration20240115095733 }, @@ -18,4 +19,5 @@ export const migrationsList: MigrationObject[] = [ { name: "Migration20240619145217", class: Migration20240619145217 }, { name: "Migration20240621102349", class: Migration20240621102349 }, { name: "Migration20240819214939", class: Migration20240819214939 }, + { name: "Migration20241016123307", class: Migration20241016123307 }, ]; From 0cf551a99fc395f090c640795d2c6e8af93bbcd7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 09:06:49 +0100 Subject: [PATCH 027/121] Update dependency @gitbeaker/node to ^35.8.1 (#150) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- demo/campaign/package.json | 2 +- demo/site/package.json | 2 +- pnpm-lock.yaml | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index e75def6f..717c8b7b 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -66,7 +66,7 @@ "@comet/eslint-config": "^7.7.0", "@emotion/babel-plugin": "^11.0.0", "@formatjs/cli": "^3.0.1", - "@gitbeaker/node": "^35.6.0", + "@gitbeaker/node": "^35.8.1", "@graphql-codegen/add": "^3.2.3", "@graphql-codegen/cli": "^2.16.5", "@graphql-codegen/fragment-matcher": "^2.0.1", diff --git a/demo/campaign/package.json b/demo/campaign/package.json index 81d6e3ea..7ed7a427 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -51,7 +51,7 @@ "@comet/cli": "^7.7.0", "@comet/eslint-config": "^7.7.0", "@formatjs/cli": "^4.2.33", - "@gitbeaker/node": "^35.6.0", + "@gitbeaker/node": "^35.8.1", "@graphql-codegen/add": "^3.2.3", "@graphql-codegen/cli": "^2.16.5", "@graphql-codegen/named-operations-object": "^2.3.1", diff --git a/demo/site/package.json b/demo/site/package.json index e0bdd77e..bfbfee05 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -52,7 +52,7 @@ "@comet/cli": "^7.7.0", "@comet/eslint-config": "^7.7.0", "@formatjs/cli": "^4.2.33", - "@gitbeaker/node": "^35.6.0", + "@gitbeaker/node": "^35.8.1", "@graphql-codegen/add": "^3.2.3", "@graphql-codegen/cli": "^2.16.5", "@graphql-codegen/named-operations-object": "^2.3.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ab0e6b04..0a243874 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -174,7 +174,7 @@ importers: specifier: ^3.0.1 version: 3.2.0 '@gitbeaker/node': - specifier: ^35.6.0 + specifier: ^35.8.1 version: 35.8.1 '@graphql-codegen/add': specifier: ^3.2.3 @@ -581,7 +581,7 @@ importers: specifier: ^4.2.33 version: 4.8.4 '@gitbeaker/node': - specifier: ^35.6.0 + specifier: ^35.8.1 version: 35.8.1 '@graphql-codegen/add': specifier: ^3.2.3 @@ -723,7 +723,7 @@ importers: specifier: ^4.2.33 version: 4.8.4 '@gitbeaker/node': - specifier: ^35.6.0 + specifier: ^35.8.1 version: 35.8.1 '@graphql-codegen/add': specifier: ^3.2.3 From 19040ff20f836c847c5ee2611d0c5a47ec0319ae Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 09:09:13 +0100 Subject: [PATCH 028/121] Update dependency @hapi/accept to ^5.0.2 (#151) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index 1741de6b..b4f16491 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -53,7 +53,7 @@ "@comet/brevo-api": "workspace:*", "@comet/cms-api": "^7.7.0", "@faker-js/faker": "^8.3.1", - "@hapi/accept": "^5.0.0", + "@hapi/accept": "^5.0.2", "@kubernetes/client-node": "^0.18.0", "@mikro-orm/cli": "^5.9.8", "@mikro-orm/core": "^5.9.8", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0a243874..881bab91 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -288,7 +288,7 @@ importers: specifier: ^8.3.1 version: 8.3.1 '@hapi/accept': - specifier: ^5.0.0 + specifier: ^5.0.2 version: 5.0.2 '@kubernetes/client-node': specifier: ^0.18.0 From 182832c15ef3af199dd2015110fed980a0de05b2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 09:11:56 +0100 Subject: [PATCH 029/121] Update dependency class-validator to ^0.14.1 (#158) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- packages/api/package.json | 2 +- pnpm-lock.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index b4f16491..f40b4bfb 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -75,7 +75,7 @@ "apollo-server-express": "^3.3.0", "async": "^3.2.0", "class-transformer": "^0.5.0", - "class-validator": "^0.14.0", + "class-validator": "^0.14.1", "cli-progress": "^3.9.0", "commander": "^7.2.0", "compression": "^1.7.4", diff --git a/packages/api/package.json b/packages/api/package.json index c10146d6..f6db120b 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -57,7 +57,7 @@ "@types/uuid": "^8.3.0", "chokidar-cli": "^2.0.0", "class-transformer": "^0.5.0", - "class-validator": "^0.14.0", + "class-validator": "^0.14.1", "eslint": "^8.0.0", "express": "^4.17.1", "graphql": "^15.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 881bab91..d84cd1a2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -354,7 +354,7 @@ importers: specifier: ^0.5.0 version: 0.5.1 class-validator: - specifier: ^0.14.0 + specifier: ^0.14.1 version: 0.14.1 cli-progress: specifier: ^3.9.0 @@ -1007,7 +1007,7 @@ importers: specifier: ^0.5.0 version: 0.5.1 class-validator: - specifier: ^0.14.0 + specifier: ^0.14.1 version: 0.14.1 eslint: specifier: ^8.0.0 From 68e2de77e9a54749dde3f3a3f01f8b8c1b7e59fa Mon Sep 17 00:00:00 2001 From: raphaelblum <44967610+raphaelblum@users.noreply.github.com> Date: Wed, 20 Nov 2024 10:11:20 +0100 Subject: [PATCH 030/121] Add new master menu style from comet starter to demo (#145) --- demo/admin/src/App.tsx | 26 +- demo/admin/src/Routes.tsx | 106 -------- demo/admin/src/common/MasterMenu.tsx | 245 +++++++++++++----- .../brevoContactsPageAttributesConfig.tsx | 8 +- 4 files changed, 206 insertions(+), 179 deletions(-) delete mode 100644 demo/admin/src/Routes.tsx diff --git a/demo/admin/src/App.tsx b/demo/admin/src/App.tsx index 5d4d66b8..82b84afc 100644 --- a/demo/admin/src/App.tsx +++ b/demo/admin/src/App.tsx @@ -2,7 +2,7 @@ import "@fontsource-variable/roboto-flex/full.css"; import "material-design-icons/iconfont/material-icons.css"; import { ApolloProvider } from "@apollo/client"; -import { ErrorDialogHandler, MuiThemeProvider, RouterBrowserRouter, SnackbarProvider } from "@comet/admin"; +import { ErrorDialogHandler, MasterLayout, MuiThemeProvider, RouterBrowserRouter, SnackbarProvider } from "@comet/admin"; import { BrevoConfigProvider } from "@comet/brevo-admin"; import { AllCategories, @@ -11,22 +11,26 @@ import { createHttpClient, CurrentUserProvider, LocaleProvider, + SitePreview, SitesConfigProvider, } from "@comet/cms-admin"; import { css, Global } from "@emotion/react"; -import { ContentScope } from "@src/common/ContentScopeProvider"; +import { ContentScope, ContentScopeProvider } from "@src/common/ContentScopeProvider"; +import { MasterRoutes } from "@src/common/MasterMenu"; import { getMessages } from "@src/lang"; import { theme } from "@src/theme"; import * as React from "react"; import { DndProvider } from "react-dnd"; import { HTML5Backend } from "react-dnd-html5-backend"; import { FormattedMessage, IntlProvider } from "react-intl"; +import { Route, Switch } from "react-router"; import { createApolloClient } from "./common/apollo/createApolloClient"; +import { MasterHeader } from "./common/MasterHeader"; +import { AppMasterMenu } from "./common/MasterMenu"; import { createConfig } from "./config"; import { Link } from "./documents/links/Link"; import { Page } from "./documents/pages/Page"; -import { Routes } from "./Routes"; const GlobalStyle = () => ( - + + {({ match }) => ( + + } + /> + + + + + + + )} + diff --git a/demo/admin/src/Routes.tsx b/demo/admin/src/Routes.tsx deleted file mode 100644 index e6015be8..00000000 --- a/demo/admin/src/Routes.tsx +++ /dev/null @@ -1,106 +0,0 @@ -import { MasterLayout, RouteWithErrorBoundary } from "@comet/admin"; -import { createBrevoConfigPage, 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"; -import { pageTreeCategories, urlParamToCategory } from "@src/pageTree/pageTreeCategories"; -import * as React from "react"; -import { useIntl } from "react-intl"; -import { RouteComponentProps } from "react-router"; -import { Redirect, Route, Switch } from "react-router-dom"; - -import { additionalFormConfig } from "./common/brevoModuleConfig/targetGroupFormConfig"; -import { ContentScope, ContentScopeProvider } from "./common/ContentScopeProvider"; -import { MasterHeader } from "./common/MasterHeader"; -import { MasterMenu } from "./common/MasterMenu"; -import { DashboardPage } from "./dashboard/DashboardPage"; -import { Link } from "./documents/links/Link"; -import { Page } from "./documents/pages/Page"; -import { EmailCampaignContentBlock } from "./emailCampaigns/blocks/EmailCampaignContentBlock"; - -const RedirectsPage = createRedirectsPage(); - -export const Routes: React.FC = () => { - const intl = useIntl(); - const brevoContactConfig = getBrevoContactConfig(intl); - - const BrevoContactsPage = createBrevoContactsPage({ - scopeParts: ["domain", "language"], - additionalAttributesFragment: brevoContactConfig.additionalAttributesFragment, - additionalGridFields: brevoContactConfig.additionalGridFields, - additionalFormFields: brevoContactConfig.additionalFormFields, - input2State: brevoContactConfig.input2State, - }); - - const TargetGroupsPage = createTargetGroupsPage({ - scopeParts: ["domain", "language"], - additionalFormFields: additionalFormConfig.additionalFormFields, - exportTargetGroupOptions: { - additionalAttributesFragment: brevoContactConfig.additionalAttributesFragment, - exportFields: brevoContactConfig.exportFields, - }, - nodeFragment: additionalFormConfig.nodeFragment, - input2State: additionalFormConfig.input2State, - }); - - const EmailCampaignsPage = createEmailCampaignsPage({ - scopeParts: ["domain", "language"], - EmailCampaignContentBlock: EmailCampaignContentBlock, - }); - - const BrevoConfigPage = createBrevoConfigPage({ - scopeParts: ["domain", "language"], - }); - - return ( - - {({ match }) => ( - - } /> - ( - - - - ) => { - const category = urlParamToCategory(params.category); - - if (category === undefined) { - return ; - } - - return ( - } - /> - ); - }} - /> - - - - - - - - - - } - /> - - - - )} - /> - - )} - - ); -}; diff --git a/demo/admin/src/common/MasterMenu.tsx b/demo/admin/src/common/MasterMenu.tsx index b12d11eb..789b8141 100644 --- a/demo/admin/src/common/MasterMenu.tsx +++ b/demo/admin/src/common/MasterMenu.tsx @@ -1,73 +1,188 @@ -import { Menu, MenuCollapsibleItem, MenuContext, MenuItemRouterLink, useWindowSize } from "@comet/admin"; import { Assets, Dashboard, Mail, PageTree, Wrench } from "@comet/admin-icons"; -import * as React from "react"; -import { useIntl } from "react-intl"; -import { useRouteMatch } from "react-router"; +import { createBrevoConfigPage, createBrevoContactsPage, createEmailCampaignsPage, createTargetGroupsPage } from "@comet/brevo-admin"; +import { + AllCategories, + ContentScopeIndicator, + createRedirectsPage, + DamPage, + DocumentInterface, + MasterMenu, + MasterMenuData, + MasterMenuRoutes, + PagesPage, + PublisherPage, +} from "@comet/cms-admin"; +import { BrevoContactConfig, getBrevoContactConfig } from "@src/common/brevoModuleConfig/brevoContactsPageAttributesConfig"; +import { additionalFormConfig } from "@src/common/brevoModuleConfig/targetGroupFormConfig"; +import { DashboardPage } from "@src/dashboard/DashboardPage"; +import { Link } from "@src/documents/links/Link"; +import { Page } from "@src/documents/pages/Page"; +import { EmailCampaignContentBlock } from "@src/emailCampaigns/blocks/EmailCampaignContentBlock"; +import React from "react"; +import { FormattedMessage, useIntl } from "react-intl"; -const permanentMenuMinWidth = 1024; +export const pageTreeCategories: AllCategories = [ + { + category: "MainNavigation", + label: , + }, +]; -export const MasterMenu: React.FC = () => { - const { open, toggleOpen } = React.useContext(MenuContext); - const windowSize = useWindowSize(); +// eslint-disable-next-line @typescript-eslint/no-explicit-any +export const pageTreeDocumentTypes: Record> = { + Page, + Link, +}; +const RedirectsPage = createRedirectsPage({ scopeParts: ["domain"] }); + +const getMasterMenuData = ({ brevoContactConfig }: { brevoContactConfig: BrevoContactConfig }): MasterMenuData => { + const BrevoContactsPage = createBrevoContactsPage({ + scopeParts: ["domain", "language"], + additionalAttributesFragment: brevoContactConfig.additionalAttributesFragment, + additionalGridFields: brevoContactConfig.additionalGridFields, + additionalFormFields: brevoContactConfig.additionalFormFields, + input2State: brevoContactConfig.input2State, + }); + + const TargetGroupsPage = createTargetGroupsPage({ + scopeParts: ["domain", "language"], + additionalFormFields: additionalFormConfig.additionalFormFields, + exportTargetGroupOptions: { + additionalAttributesFragment: brevoContactConfig.additionalAttributesFragment, + exportFields: brevoContactConfig.exportFields, + }, + nodeFragment: additionalFormConfig.nodeFragment, + input2State: additionalFormConfig.input2State, + }); + + const CampaignsPage = createEmailCampaignsPage({ + scopeParts: ["domain", "language"], + EmailCampaignContentBlock, + }); + + const BrevoConfigPage = createBrevoConfigPage({ + scopeParts: ["domain", "language"], + }); + + return [ + { + type: "route", + primary: , + icon: , + route: { + path: "/dashboard", + component: DashboardPage, + }, + }, + { + type: "route", + primary: , + icon: , + route: { + path: "/pages/pagetree/main-navigation", + render: () => ( + } + /> + ), + }, + requiredPermission: "pageTree", + }, + { + type: "collapsible", + primary: , + icon: , + items: [ + { + type: "route", + primary: , + route: { + path: "/newsletter/email-campaigns", + component: CampaignsPage, + }, + }, + { + type: "route", + primary: , + route: { + path: "/newsletter/contacts", + render: () => , + }, + }, + { + type: "route", + primary: , + route: { + path: "/newsletter/target-groups", + render: () => , + }, + }, + { + type: "route", + primary: , + route: { + path: "/newsletter/config", + render: () => , + }, + }, + ], + requiredPermission: "brevo-newsletter", + }, + { + type: "route", + primary: , + icon: , + route: { + path: "/assets", + component: DamPage, + }, + requiredPermission: "dam", + }, + { + type: "collapsible", + primary: , + icon: , + items: [ + { + type: "route", + primary: , + route: { + path: "/system/publisher", + component: PublisherPage, + }, + requiredPermission: "builds", + }, + { + type: "route", + primary: , + route: { + path: "/system/redirects", + render: () => , + }, + requiredPermission: "pageTree", + }, + ], + requiredPermission: "pageTree", + }, + ]; +}; + +export const AppMasterMenu = () => { const intl = useIntl(); - const match = useRouteMatch(); - const useTemporaryMenu: boolean = windowSize.width < permanentMenuMinWidth; + const masterMenuDataForScope = React.useMemo(() => getMasterMenuData({ brevoContactConfig: getBrevoContactConfig(intl) }), [intl]); + + return ; +}; + +export const MasterRoutes = () => { + const intl = useIntl(); - // Open menu when changing to permanent variant and close when changing to temporary variant. - React.useEffect(() => { - if ((useTemporaryMenu && open) || (!useTemporaryMenu && !open)) { - toggleOpen(); - } - // useEffect dependencies must only include `location`, because the function should only be called once after changing the location. - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [location]); + const masterMenuDataForScope = React.useMemo(() => getMasterMenuData({ brevoContactConfig: getBrevoContactConfig(intl) }), [intl]); - return ( - - } - to={`${match.url}/dashboard`} - /> - } - to={`${match.url}/pages/pagetree/main-navigation`} - /> - }> - - - - - - } - to={`${match.url}/assets`} - /> - }> - - - - - ); + return ; }; diff --git a/demo/admin/src/common/brevoModuleConfig/brevoContactsPageAttributesConfig.tsx b/demo/admin/src/common/brevoModuleConfig/brevoContactsPageAttributesConfig.tsx index 208219c0..d1712c62 100644 --- a/demo/admin/src/common/brevoModuleConfig/brevoContactsPageAttributesConfig.tsx +++ b/demo/admin/src/common/brevoModuleConfig/brevoContactsPageAttributesConfig.tsx @@ -59,9 +59,7 @@ export const additionalFormConfig = { nodeFragment: attributesFragment, }; -export const getBrevoContactConfig = ( - intl: IntlShape, -): { +export interface BrevoContactConfig { additionalGridFields: GridColDef[]; additionalFormFields: React.ReactNode; additionalAttributesFragment: { @@ -77,7 +75,9 @@ export const getBrevoContactConfig = ( renderValue: (row: GQLBrevoContactAttributesFragmentFragment) => string; headerName: string; }[]; -} => { +} + +export const getBrevoContactConfig = (intl: IntlShape): BrevoContactConfig => { return { additionalGridFields: [ { From 890539b03e645c47775393b93cec3ef5d012eedf Mon Sep 17 00:00:00 2001 From: raphaelblum <44967610+raphaelblum@users.noreply.github.com> Date: Wed, 20 Nov 2024 10:20:29 +0100 Subject: [PATCH 031/121] Remove unnecessary async package (#162) --- demo/api/package.json | 1 - pnpm-lock.yaml | 3 --- 2 files changed, 4 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index f40b4bfb..563464fa 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -73,7 +73,6 @@ "@opentelemetry/sdk-node": "^0.46.0", "apollo-server-core": "^3.3.0", "apollo-server-express": "^3.3.0", - "async": "^3.2.0", "class-transformer": "^0.5.0", "class-validator": "^0.14.1", "cli-progress": "^3.9.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d84cd1a2..5fc2e0ca 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -347,9 +347,6 @@ importers: apollo-server-express: specifier: ^3.3.0 version: 3.13.0(express@4.20.0)(graphql@15.8.0) - async: - specifier: ^3.2.0 - version: 3.2.5 class-transformer: specifier: ^0.5.0 version: 0.5.1 From 0b8b5c52accd62da378b6991448076af9e925be1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 10:28:18 +0100 Subject: [PATCH 032/121] Update dependency cookie-parser to ^1.4.7 (#163) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- pnpm-lock.yaml | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index 563464fa..2cf710f3 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -78,7 +78,7 @@ "cli-progress": "^3.9.0", "commander": "^7.2.0", "compression": "^1.7.4", - "cookie-parser": "^1.4.5", + "cookie-parser": "^1.4.7", "exifr": "^6.0.0", "express": "^4.18.2", "file-type": "^16.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5fc2e0ca..022a0f39 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -363,8 +363,8 @@ importers: specifier: ^1.7.4 version: 1.7.4 cookie-parser: - specifier: ^1.4.5 - version: 1.4.6 + specifier: ^1.4.7 + version: 1.4.7 exifr: specifier: ^6.0.0 version: 6.3.0 @@ -11475,22 +11475,17 @@ packages: /convert-source-map@2.0.0: resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} - /cookie-parser@1.4.6: - resolution: {integrity: sha512-z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==} + /cookie-parser@1.4.7: + resolution: {integrity: sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==} engines: {node: '>= 0.8.0'} dependencies: - cookie: 0.4.1 + cookie: 0.7.2 cookie-signature: 1.0.6 dev: false /cookie-signature@1.0.6: resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==} - /cookie@0.4.1: - resolution: {integrity: sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==} - engines: {node: '>= 0.6'} - dev: false - /cookie@0.5.0: resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==} engines: {node: '>= 0.6'} @@ -11499,6 +11494,11 @@ packages: resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==} engines: {node: '>= 0.6'} + /cookie@0.7.2: + resolution: {integrity: sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==} + engines: {node: '>= 0.6'} + dev: false + /core-js-compat@3.35.0: resolution: {integrity: sha512-5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw==} dependencies: From 1d6f7206c7562d917f2fcd4129ea5a04b00bcb96 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 10:28:36 +0100 Subject: [PATCH 033/121] Update dependency chokidar-cli to ^2.1.0 (#156) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/campaign/package.json | 2 +- demo/site/package.json | 2 +- packages/api/package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/demo/campaign/package.json b/demo/campaign/package.json index 7ed7a427..e69751e3 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -64,7 +64,7 @@ "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", "@types/styled-components": "^5.0.0", - "chokidar-cli": "^2.0.0", + "chokidar-cli": "^2.1.0", "dotenv-cli": "^6.0.0", "eslint": "^8.0.0", "npm-run-all2": "^5.0.0", diff --git a/demo/site/package.json b/demo/site/package.json index bfbfee05..1510e575 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -65,7 +65,7 @@ "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", "@types/styled-components": "^5.0.0", - "chokidar-cli": "^2.0.0", + "chokidar-cli": "^2.1.0", "dotenv-cli": "^6.0.0", "eslint": "^8.0.0", "npm-run-all2": "^5.0.0", diff --git a/packages/api/package.json b/packages/api/package.json index f6db120b..114e2b39 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -55,7 +55,7 @@ "@types/node-fetch": "^2.5.12", "@types/rimraf": "^3.0.0", "@types/uuid": "^8.3.0", - "chokidar-cli": "^2.0.0", + "chokidar-cli": "^2.1.0", "class-transformer": "^0.5.0", "class-validator": "^0.14.1", "eslint": "^8.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 022a0f39..a633e803 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -617,7 +617,7 @@ importers: specifier: ^5.0.0 version: 5.1.34 chokidar-cli: - specifier: ^2.0.0 + specifier: ^2.1.0 version: 2.1.0 dotenv-cli: specifier: ^6.0.0 @@ -759,7 +759,7 @@ importers: specifier: ^5.0.0 version: 5.1.34 chokidar-cli: - specifier: ^2.0.0 + specifier: ^2.1.0 version: 2.1.0 dotenv-cli: specifier: ^6.0.0 @@ -998,7 +998,7 @@ importers: specifier: ^8.3.0 version: 8.3.4 chokidar-cli: - specifier: ^2.0.0 + specifier: ^2.1.0 version: 2.1.0 class-transformer: specifier: ^0.5.0 @@ -11066,7 +11066,7 @@ packages: engines: {node: '>= 8.10.0'} hasBin: true dependencies: - chokidar: 3.5.3 + chokidar: 3.6.0 lodash.debounce: 4.0.8 lodash.throttle: 4.1.1 yargs: 13.3.2 From 15ab2b25ddc0aa06907a96294fafc9e31e0ddfbe Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 10:28:56 +0100 Subject: [PATCH 034/121] Update dependency cache-manager to ^5.7.6 (#154) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/api/package.json | 2 +- pnpm-lock.yaml | 56 +++++++++++++++++++-------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/packages/api/package.json b/packages/api/package.json index 114e2b39..cb2fc405 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -30,7 +30,7 @@ "@getbrevo/brevo": "^2.2.0", "@nestjs/axios": "^1.0.1", "@nestjs/cache-manager": "^2.3.0", - "cache-manager": "^5.7.3", + "cache-manager": "^5.7.6", "commander": "^7.2.0", "node-fetch": "^2.6.1" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a633e803..985bdd9f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -313,7 +313,7 @@ importers: 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) '@nestjs/common': specifier: ^9.4.3 - version: 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + version: 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/config': specifier: ^2.3.4 version: 2.3.4(@nestjs/common@9.4.3)(reflect-metadata@0.1.14)(rxjs@7.8.1) @@ -926,10 +926,10 @@ importers: version: 1.0.1(@nestjs/common@9.4.3)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/cache-manager': specifier: ^2.3.0 - version: 2.3.0(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(cache-manager@5.7.3)(rxjs@7.8.1) + version: 2.3.0(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(cache-manager@5.7.6)(rxjs@7.8.1) cache-manager: - specifier: ^5.7.3 - version: 5.7.3 + specifier: ^5.7.6 + version: 5.7.6 commander: specifier: ^7.2.0 version: 7.2.0 @@ -966,7 +966,7 @@ importers: version: 5.9.8(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8) '@nestjs/common': specifier: ^9.4.3 - version: 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + version: 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/core': specifier: ^9.4.3 version: 9.4.3(@nestjs/common@9.4.3)(@nestjs/platform-express@9.4.3)(reflect-metadata@0.1.14)(rxjs@7.8.1) @@ -3937,7 +3937,7 @@ packages: peerDependencies: '@nestjs/common': ^9.0.0 dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) class-transformer: 0.5.1 class-validator: 0.13.2 rimraf: 3.0.2 @@ -4076,7 +4076,7 @@ packages: '@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.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(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.14.1)(graphql@15.8.0)(reflect-metadata@0.1.14) '@nestjs/jwt': 9.0.0(@nestjs/common@9.4.3) @@ -4781,7 +4781,7 @@ packages: '@nestjs/common': ^9.x '@nestjs/core': ^9.x dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(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) lodash: 4.17.21 @@ -6317,7 +6317,7 @@ packages: '@nestjs/core': ^8.0.0 || ^9.0.0 || ^10.0.0 dependencies: '@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.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(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.8(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8): @@ -6597,7 +6597,7 @@ packages: apollo-server-fastify: optional: true dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(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.14.1)(graphql@15.8.0)(reflect-metadata@0.1.14) apollo-server-core: 3.13.0(graphql@15.8.0) @@ -6615,7 +6615,7 @@ packages: reflect-metadata: ^0.1.12 rxjs: ^6.0.0 || ^7.0.0 dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) axios: 1.2.1 reflect-metadata: 0.1.14 rxjs: 7.8.1 @@ -6623,7 +6623,7 @@ packages: - debug dev: false - /@nestjs/cache-manager@2.3.0(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(cache-manager@5.7.3)(rxjs@7.8.1): + /@nestjs/cache-manager@2.3.0(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(cache-manager@5.7.6)(rxjs@7.8.1): resolution: {integrity: sha512-pxeBp9w/s99HaW2+pezM1P3fLiWmUEnTUoUMLa9UYViCtjj0E0A19W/vaT5JFACCzFIeNrwH4/16jkpAhQ25Vw==} peerDependencies: '@nestjs/common': ^9.0.0 || ^10.0.0 @@ -6631,9 +6631,9 @@ packages: cache-manager: <=5 rxjs: ^7.0.0 dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(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) - cache-manager: 5.7.3 + cache-manager: 5.7.6 rxjs: 7.8.1 dev: false @@ -6671,7 +6671,7 @@ packages: - webpack-cli dev: true - /@nestjs/common@9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1): + /@nestjs/common@9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1): resolution: {integrity: sha512-Gd6D4IaYj01o14Bwv81ukidn4w3bPHCblMUq+SmUmWLyosK+XQmInCS09SbDDZyL8jy86PngtBLTdhJ2bXSUig==} peerDependencies: cache-manager: <=5 @@ -6687,7 +6687,7 @@ packages: class-validator: optional: true dependencies: - cache-manager: 5.7.3 + cache-manager: 5.7.6 class-transformer: 0.5.1 class-validator: 0.14.1 iterare: 1.2.1 @@ -6703,7 +6703,7 @@ packages: reflect-metadata: ^0.1.13 rxjs: ^6.0.0 || ^7.2.0 dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) dotenv: 16.1.4 dotenv-expand: 10.0.0 lodash: 4.17.21 @@ -6730,7 +6730,7 @@ packages: '@nestjs/websockets': optional: true dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/platform-express': 9.4.3(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) '@nuxtjs/opencollective': 0.3.2 fast-safe-stringify: 2.1.1 @@ -6767,7 +6767,7 @@ packages: '@graphql-tools/merge': 8.3.18(graphql@15.8.0) '@graphql-tools/schema': 9.0.16(graphql@15.8.0) '@graphql-tools/utils': 9.2.1(graphql@15.8.0) - '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(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/mapped-types': 1.2.2(@nestjs/common@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14) chokidar: 3.5.3 @@ -6793,7 +6793,7 @@ packages: peerDependencies: '@nestjs/common': ^8.0.0 || ^9.0.0 dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@types/jsonwebtoken': 8.5.8 jsonwebtoken: 8.5.1 @@ -6810,7 +6810,7 @@ packages: class-validator: optional: true dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) class-transformer: 0.5.1 class-validator: 0.13.2 reflect-metadata: 0.1.14 @@ -6828,7 +6828,7 @@ packages: class-validator: optional: true dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) class-transformer: 0.5.1 class-validator: 0.14.1 reflect-metadata: 0.1.14 @@ -6839,7 +6839,7 @@ packages: '@nestjs/common': ^8.0.0 || ^9.0.0 passport: ^0.4.0 || ^0.5.0 || ^0.6.0 dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) passport: 0.6.0 /@nestjs/platform-express@9.4.3(@nestjs/common@9.4.3)(@nestjs/core@9.4.3): @@ -6848,7 +6848,7 @@ packages: '@nestjs/common': ^9.0.0 '@nestjs/core': ^9.0.0 dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(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) body-parser: 1.20.2 cors: 2.8.5 @@ -6885,7 +6885,7 @@ packages: '@nestjs/platform-express': optional: true dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(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/platform-express': 9.4.3(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) tslib: 2.5.3 @@ -10863,8 +10863,8 @@ packages: resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} engines: {node: '>= 0.8'} - /cache-manager@5.7.3: - resolution: {integrity: sha512-Vp2gd2aDm/MXdEWD0FLdOflvcVj4rdJ1FFmPUeOKq+fuL7MEUcezbTWxQmVB1TTN5Ig92CabMfi5z+HyQwVg9A==} + /cache-manager@5.7.6: + resolution: {integrity: sha512-wBxnBHjDxF1RXpHCBD6HGvKER003Ts7IIm0CHpggliHzN1RZditb7rXoduE1rplc2DEFYKxhLKgFuchXMJje9w==} engines: {node: '>= 18'} dependencies: eventemitter3: 5.0.1 @@ -17397,7 +17397,7 @@ packages: '@nestjs/common': ^9 '@nestjs/core': ^9 dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(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) commander: 8.3.0 ora: 5.4.1 From 44c4e4908584af7542bfd9b160a3f6e639d97c49 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 10:34:42 +0100 Subject: [PATCH 035/121] Update dependency date-fns to ^2.30.0 (#164) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- packages/admin/package.json | 2 +- pnpm-lock.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 717c8b7b..353fe11f 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -41,7 +41,7 @@ "@mui/system": "^5.8.6", "@mui/x-data-grid": "^5.17.26", "change-case": "^5.3.0", - "date-fns": "^2.28.0", + "date-fns": "^2.30.0", "draft-js": "^0.11.0", "exceljs": "^3.4.0", "file-saver": "^2.0.2", diff --git a/packages/admin/package.json b/packages/admin/package.json index 7650c185..6ff3c503 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -28,7 +28,7 @@ "start:types": "tsc --project ./tsconfig.json --emitDeclarationOnly --watch --preserveWatchOutput" }, "dependencies": { - "date-fns": "^2.28.0", + "date-fns": "^2.30.0", "file-saver": "^2.0.5", "lodash.isequal": "^4.0.0", "react-dropzone": "^14.2.3" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 985bdd9f..ad0774bc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -104,7 +104,7 @@ importers: specifier: ^5.3.0 version: 5.4.2 date-fns: - specifier: ^2.28.0 + specifier: ^2.30.0 version: 2.30.0 draft-js: specifier: ^0.11.0 @@ -786,7 +786,7 @@ importers: packages/admin: dependencies: date-fns: - specifier: ^2.28.0 + specifier: ^2.30.0 version: 2.30.0 file-saver: specifier: ^2.0.5 From 65be206feb090aae52f45dcb662c74b3cad471b7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 10:35:00 +0100 Subject: [PATCH 036/121] Update dependency cli-progress to ^3.12.0 (#160) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index 2cf710f3..bc1ab030 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -75,7 +75,7 @@ "apollo-server-express": "^3.3.0", "class-transformer": "^0.5.0", "class-validator": "^0.14.1", - "cli-progress": "^3.9.0", + "cli-progress": "^3.12.0", "commander": "^7.2.0", "compression": "^1.7.4", "cookie-parser": "^1.4.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ad0774bc..b1462632 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -354,7 +354,7 @@ importers: specifier: ^0.14.1 version: 0.14.1 cli-progress: - specifier: ^3.9.0 + specifier: ^3.12.0 version: 3.12.0 commander: specifier: ^7.2.0 From 5637bf6ac1c740ef5fad3aa64cf791f168361580 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 10:43:53 +0100 Subject: [PATCH 037/121] Update dependency compression to ^1.7.5 (#161) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/server/package-lock.json | 104 ++++++++++------------------ demo/admin/server/package.json | 2 +- demo/api/package.json | 2 +- pnpm-lock.yaml | 24 ++++++- 4 files changed, 62 insertions(+), 70 deletions(-) diff --git a/demo/admin/server/package-lock.json b/demo/admin/server/package-lock.json index 94254598..4efdec5f 100644 --- a/demo/admin/server/package-lock.json +++ b/demo/admin/server/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "server", "dependencies": { - "compression": "^1.7.4", + "compression": "^1.7.5", "envsub": "^4.1.0", "express": "^4.17.1", "helmet": "^7.0.0" @@ -124,18 +124,11 @@ "npm": "1.2.8000 || >= 1.4.16" } }, - "node_modules/body-parser/node_modules/bytes": { + "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -206,22 +199,32 @@ } }, "node_modules/compression": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", - "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz", + "integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==", + "license": "MIT", "dependencies": { - "accepts": "~1.3.5", - "bytes": "3.0.0", - "compressible": "~2.0.16", + "bytes": "3.1.2", + "compressible": "~2.0.18", "debug": "2.6.9", + "negotiator": "~0.6.4", "on-headers": "~1.0.2", - "safe-buffer": "5.1.2", + "safe-buffer": "5.2.1", "vary": "~1.1.2" }, "engines": { "node": ">= 0.8.0" } }, + "node_modules/compression/node_modules/negotiator": { + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", + "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -233,25 +236,6 @@ "node": ">= 0.6" } }, - "node_modules/content-disposition/node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, "node_modules/content-type": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", @@ -590,25 +574,6 @@ "node": ">= 0.10.0" } }, - "node_modules/express/node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, "node_modules/finalhandler": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", @@ -1306,14 +1271,6 @@ "node": ">= 0.8" } }, - "node_modules/raw-body/node_modules/bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/regexp.prototype.flags": { "version": "1.5.3", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz", @@ -1357,9 +1314,24 @@ } }, "node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" }, "node_modules/safe-regex-test": { "version": "1.0.3", diff --git a/demo/admin/server/package.json b/demo/admin/server/package.json index 0774180e..5fafc638 100644 --- a/demo/admin/server/package.json +++ b/demo/admin/server/package.json @@ -6,7 +6,7 @@ "serve": "node server.js" }, "dependencies": { - "compression": "^1.7.4", + "compression": "^1.7.5", "envsub": "^4.1.0", "express": "^4.17.1", "helmet": "^7.0.0" diff --git a/demo/api/package.json b/demo/api/package.json index bc1ab030..e126b550 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -77,7 +77,7 @@ "class-validator": "^0.14.1", "cli-progress": "^3.12.0", "commander": "^7.2.0", - "compression": "^1.7.4", + "compression": "^1.7.5", "cookie-parser": "^1.4.7", "exifr": "^6.0.0", "express": "^4.18.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b1462632..31609ca9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -360,8 +360,8 @@ importers: specifier: ^7.2.0 version: 7.2.0 compression: - specifier: ^1.7.4 - version: 1.7.4 + specifier: ^1.7.5 + version: 1.7.5 cookie-parser: specifier: ^1.4.7 version: 1.4.7 @@ -11423,6 +11423,21 @@ packages: transitivePeerDependencies: - supports-color + /compression@1.7.5: + resolution: {integrity: sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==} + engines: {node: '>= 0.8.0'} + dependencies: + bytes: 3.1.2 + compressible: 2.0.18 + debug: 2.6.9 + negotiator: 0.6.4 + on-headers: 1.0.2 + safe-buffer: 5.2.1 + vary: 1.1.2 + transitivePeerDependencies: + - supports-color + dev: false + /compute-scroll-into-view@1.0.20: resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==} @@ -17388,6 +17403,11 @@ packages: resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==} engines: {node: '>= 0.6'} + /negotiator@0.6.4: + resolution: {integrity: sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==} + engines: {node: '>= 0.6'} + dev: false + /neo-async@2.6.2: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} From 68dbb89878f6c16b4579ef5652c1a66725c1478d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 11:21:09 +0100 Subject: [PATCH 038/121] Update dependency class-transformer to ^0.5.1 (#157) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- packages/api/package.json | 2 +- pnpm-lock.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index e126b550..fab527c7 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -73,7 +73,7 @@ "@opentelemetry/sdk-node": "^0.46.0", "apollo-server-core": "^3.3.0", "apollo-server-express": "^3.3.0", - "class-transformer": "^0.5.0", + "class-transformer": "^0.5.1", "class-validator": "^0.14.1", "cli-progress": "^3.12.0", "commander": "^7.2.0", diff --git a/packages/api/package.json b/packages/api/package.json index cb2fc405..7deed58d 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -56,7 +56,7 @@ "@types/rimraf": "^3.0.0", "@types/uuid": "^8.3.0", "chokidar-cli": "^2.1.0", - "class-transformer": "^0.5.0", + "class-transformer": "^0.5.1", "class-validator": "^0.14.1", "eslint": "^8.0.0", "express": "^4.17.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 31609ca9..bc78a485 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -348,7 +348,7 @@ importers: specifier: ^3.3.0 version: 3.13.0(express@4.20.0)(graphql@15.8.0) class-transformer: - specifier: ^0.5.0 + specifier: ^0.5.1 version: 0.5.1 class-validator: specifier: ^0.14.1 @@ -1001,7 +1001,7 @@ importers: specifier: ^2.1.0 version: 2.1.0 class-transformer: - specifier: ^0.5.0 + specifier: ^0.5.1 version: 0.5.1 class-validator: specifier: ^0.14.1 From 47b5f26fb241981f9f1fbbf87cd2631d033164ef Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 11:21:23 +0100 Subject: [PATCH 039/121] Update dependency change-case to ^5.4.4 (#155) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 353fe11f..15232556 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -40,7 +40,7 @@ "@mui/material": "^5.8.6", "@mui/system": "^5.8.6", "@mui/x-data-grid": "^5.17.26", - "change-case": "^5.3.0", + "change-case": "^5.4.4", "date-fns": "^2.30.0", "draft-js": "^0.11.0", "exceljs": "^3.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bc78a485..a13cb86d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -101,8 +101,8 @@ importers: 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) change-case: - specifier: ^5.3.0 - version: 5.4.2 + specifier: ^5.4.4 + version: 5.4.4 date-fns: specifier: ^2.30.0 version: 2.30.0 @@ -11026,8 +11026,8 @@ packages: snake-case: 3.0.4 tslib: 2.8.1 - /change-case@5.4.2: - resolution: {integrity: sha512-WB3UiTDpT+vrTilAWaJS4gaIH/jc1He4H9f6erQvraUYas90uWT0JOYFkG1imdNv710XJ6gJvqynrgOHc4ihDA==} + /change-case@5.4.4: + resolution: {integrity: sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==} dev: false /char-regex@1.0.2: From 5fb06cdf3092a66f25178cb68acd5e23f45aafd2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 11:21:39 +0100 Subject: [PATCH 040/121] Update dependency babel-preset-react-app to ^10.0.1 (#153) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- pnpm-lock.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 15232556..9175aea9 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -83,7 +83,7 @@ "@types/react-router-dom": "^5.1.7", "@types/webpack-env": "^1.13.9", "babel-loader": "^8.0.0", - "babel-preset-react-app": "^10.0.0", + "babel-preset-react-app": "^10.0.1", "chokidar-cli": "^2.1.0", "cross-env": "^7.0.3", "css-loader": "^6.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a13cb86d..c1228070 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -225,7 +225,7 @@ importers: specifier: ^8.0.0 version: 8.3.0(@babel/core@7.23.7)(webpack@5.94.0) babel-preset-react-app: - specifier: ^10.0.0 + specifier: ^10.0.1 version: 10.0.1 chokidar-cli: specifier: ^2.1.0 @@ -10598,7 +10598,7 @@ packages: '@babel/preset-env': 7.23.8(@babel/core@7.23.7) '@babel/preset-react': 7.23.3(@babel/core@7.23.7) '@babel/preset-typescript': 7.23.3(@babel/core@7.23.7) - '@babel/runtime': 7.23.8 + '@babel/runtime': 7.24.5 babel-plugin-macros: 3.1.0 babel-plugin-transform-react-remove-prop-types: 0.4.24 transitivePeerDependencies: From 0e10fba3922b322cc1f0889f5b18eca33811ac73 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 11:29:49 +0100 Subject: [PATCH 041/121] Update dependency @changesets/cli to ^2.27.10 (#165) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 111 +++++++++++++++++++++++++++++-------------------- 2 files changed, 68 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index 7e313948..82c4e8f9 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ }, "devDependencies": { "@comet/dev-process-manager": "^2.6.1", - "@changesets/cli": "^2.27.9", + "@changesets/cli": "^2.27.10", "@formatjs/cli": "^4.8.3", "@types/node": "^18.0.0", "dotenv-cli": "^6.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c1228070..fe4230a5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,8 +11,8 @@ importers: .: devDependencies: '@changesets/cli': - specifier: ^2.27.9 - version: 2.27.9 + specifier: ^2.27.10 + version: 2.27.10 '@comet/dev-process-manager': specifier: ^2.6.1 version: 2.6.1 @@ -3520,12 +3520,12 @@ packages: requireindex: 1.1.0 dev: true - /@changesets/apply-release-plan@7.0.5: - resolution: {integrity: sha512-1cWCk+ZshEkSVEZrm2fSj1Gz8sYvxgUL4Q78+1ZZqeqfuevPTPk033/yUZ3df8BKMohkqqHfzj0HOOrG0KtXTw==} + /@changesets/apply-release-plan@7.0.6: + resolution: {integrity: sha512-TKhVLtiwtQOgMAC0fCJfmv93faiViKSDqr8oMEqrnNs99gtSC1sZh/aEMS9a+dseU1ESZRCK+ofLgGY7o0fw/Q==} dependencies: - '@changesets/config': 3.0.3 + '@changesets/config': 3.0.4 '@changesets/get-version-range-type': 0.4.0 - '@changesets/git': 3.0.1 + '@changesets/git': 3.0.2 '@changesets/should-skip-package': 0.1.1 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 @@ -3538,8 +3538,8 @@ packages: semver: 7.5.4 dev: true - /@changesets/assemble-release-plan@6.0.4: - resolution: {integrity: sha512-nqICnvmrwWj4w2x0fOhVj2QEGdlUuwVAwESrUo5HLzWMI1rE5SWfsr9ln+rDqWB6RQ2ZyaMZHUcU7/IRaUJS+Q==} + /@changesets/assemble-release-plan@6.0.5: + resolution: {integrity: sha512-IgvBWLNKZd6k4t72MBTBK3nkygi0j3t3zdC1zrfusYo0KpdsvnDjrMM9vPnTCLCMlfNs55jRL4gIMybxa64FCQ==} dependencies: '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.1.2 @@ -3555,21 +3555,21 @@ packages: '@changesets/types': 6.0.0 dev: true - /@changesets/cli@2.27.9: - resolution: {integrity: sha512-q42a/ZbDnxPpCb5Wkm6tMVIxgeI9C/bexntzTeCFBrQEdpisQqk8kCHllYZMDjYtEc1ZzumbMJAG8H0Z4rdvjg==} + /@changesets/cli@2.27.10: + resolution: {integrity: sha512-PfeXjvs9OfQJV8QSFFHjwHX3QnUL9elPEQ47SgkiwzLgtKGyuikWjrdM+lO9MXzOE22FO9jEGkcs4b+B6D6X0Q==} hasBin: true dependencies: - '@changesets/apply-release-plan': 7.0.5 - '@changesets/assemble-release-plan': 6.0.4 + '@changesets/apply-release-plan': 7.0.6 + '@changesets/assemble-release-plan': 6.0.5 '@changesets/changelog-git': 0.2.0 - '@changesets/config': 3.0.3 + '@changesets/config': 3.0.4 '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.1.2 - '@changesets/get-release-plan': 4.0.4 - '@changesets/git': 3.0.1 + '@changesets/get-release-plan': 4.0.5 + '@changesets/git': 3.0.2 '@changesets/logger': 0.1.1 '@changesets/pre': 2.0.1 - '@changesets/read': 0.6.1 + '@changesets/read': 0.6.2 '@changesets/should-skip-package': 0.1.1 '@changesets/types': 6.0.0 '@changesets/write': 0.3.2 @@ -3585,12 +3585,12 @@ packages: picocolors: 1.1.1 resolve-from: 5.0.0 semver: 7.5.4 - spawndamnit: 2.0.0 + spawndamnit: 3.0.1 term-size: 2.2.1 dev: true - /@changesets/config@3.0.3: - resolution: {integrity: sha512-vqgQZMyIcuIpw9nqFIpTSNyc/wgm/Lu1zKN5vECy74u95Qx/Wa9g27HdgO4NkVAaq+BGA8wUc/qvbvVNs93n6A==} + /@changesets/config@3.0.4: + resolution: {integrity: sha512-+DiIwtEBpvvv1z30f8bbOsUQGuccnZl9KRKMM/LxUHuDu5oEjmN+bJQ1RIBKNJjfYMQn8RZzoPiX0UgPaLQyXw==} dependencies: '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.1.2 @@ -3598,7 +3598,7 @@ packages: '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 - micromatch: 4.0.5 + micromatch: 4.0.8 dev: true /@changesets/errors@0.2.0: @@ -3616,13 +3616,13 @@ packages: semver: 7.5.4 dev: true - /@changesets/get-release-plan@4.0.4: - resolution: {integrity: sha512-SicG/S67JmPTrdcc9Vpu0wSQt7IiuN0dc8iR5VScnnTVPfIaLvKmEGRvIaF0kcn8u5ZqLbormZNTO77bCEvyWw==} + /@changesets/get-release-plan@4.0.5: + resolution: {integrity: sha512-E6wW7JoSMcctdVakut0UB76FrrN3KIeJSXvB+DHMFo99CnC3ZVnNYDCVNClMlqAhYGmLmAj77QfApaI3ca4Fkw==} dependencies: - '@changesets/assemble-release-plan': 6.0.4 - '@changesets/config': 3.0.3 + '@changesets/assemble-release-plan': 6.0.5 + '@changesets/config': 3.0.4 '@changesets/pre': 2.0.1 - '@changesets/read': 0.6.1 + '@changesets/read': 0.6.2 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 dev: true @@ -3631,14 +3631,14 @@ packages: resolution: {integrity: sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==} dev: true - /@changesets/git@3.0.1: - resolution: {integrity: sha512-pdgHcYBLCPcLd82aRcuO0kxCDbw/yISlOtkmwmE8Odo1L6hSiZrBOsRl84eYG7DRCab/iHnOkWqExqc4wxk2LQ==} + /@changesets/git@3.0.2: + resolution: {integrity: sha512-r1/Kju9Y8OxRRdvna+nxpQIsMsRQn9dhhAZt94FLDeu0Hij2hnOozW8iqnHBgvu+KdnJppCveQwK4odwfw/aWQ==} dependencies: '@changesets/errors': 0.2.0 '@manypkg/get-packages': 1.1.3 is-subdir: 1.2.0 - micromatch: 4.0.5 - spawndamnit: 2.0.0 + micromatch: 4.0.8 + spawndamnit: 3.0.1 dev: true /@changesets/logger@0.1.1: @@ -3663,10 +3663,10 @@ packages: fs-extra: 7.0.1 dev: true - /@changesets/read@0.6.1: - resolution: {integrity: sha512-jYMbyXQk3nwP25nRzQQGa1nKLY0KfoOV7VLgwucI0bUO8t8ZLCr6LZmgjXsiKuRDc+5A6doKPr9w2d+FEJ55zQ==} + /@changesets/read@0.6.2: + resolution: {integrity: sha512-wjfQpJvryY3zD61p8jR87mJdyx2FIhEcdXhKUqkja87toMrP/3jtg/Yg29upN+N4Ckf525/uvV7a4tzBlpk6gg==} dependencies: - '@changesets/git': 3.0.1 + '@changesets/git': 3.0.2 '@changesets/logger': 0.1.1 '@changesets/parse': 0.4.0 '@changesets/types': 6.0.0 @@ -10777,6 +10777,13 @@ packages: dependencies: fill-range: 7.0.1 + /braces@3.0.3: + resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} + engines: {node: '>=8'} + dependencies: + fill-range: 7.1.1 + dev: true + /browser-process-hrtime@1.0.0: resolution: {integrity: sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==} dev: true @@ -11628,14 +11635,6 @@ packages: transitivePeerDependencies: - encoding - /cross-spawn@5.1.0: - resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==} - dependencies: - lru-cache: 4.0.2 - shebang-command: 1.2.0 - which: 1.3.1 - dev: true - /cross-spawn@6.0.5: resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==} engines: {node: '>=4.8'} @@ -11655,6 +11654,15 @@ packages: shebang-command: 2.0.0 which: 2.0.2 + /cross-spawn@7.0.6: + resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} + engines: {node: '>= 8'} + dependencies: + path-key: 3.1.1 + shebang-command: 2.0.0 + which: 2.0.2 + dev: true + /crypto-random-string@4.0.0: resolution: {integrity: sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==} engines: {node: '>=12'} @@ -13333,6 +13341,13 @@ packages: dependencies: to-regex-range: 5.0.1 + /fill-range@7.1.1: + resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} + engines: {node: '>=8'} + dependencies: + to-regex-range: 5.0.1 + dev: true + /filter-obj@1.1.0: resolution: {integrity: sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==} engines: {node: '>=0.10.0'} @@ -16787,6 +16802,14 @@ packages: braces: 3.0.2 picomatch: 2.3.1 + /micromatch@4.0.8: + resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} + engines: {node: '>=8.6'} + dependencies: + braces: 3.0.3 + picomatch: 2.3.1 + dev: true + /mikro-orm@5.9.8: resolution: {integrity: sha512-iBku1gU9xkA2FCw2wy0K4x3EQzsRE52dYGkGUVQEthRmc/vIMBwXyiTAj+oARzXrkWqslFtlZA/2upeqZhMQlw==} engines: {node: '>= 14.0.0'} @@ -19831,11 +19854,11 @@ packages: engines: {node: '>= 8'} dev: true - /spawndamnit@2.0.0: - resolution: {integrity: sha512-j4JKEcncSjFlqIwU5L/rp2N5SIPsdxaRsIv678+TZxZ0SRDJTm8JrxJMjE/XuiEZNEir3S8l0Fa3Ke339WI4qA==} + /spawndamnit@3.0.1: + resolution: {integrity: sha512-MmnduQUuHCoFckZoWnXsTg7JaiLBJrKFj9UI2MbRPGaJeVpsLcVBu6P/IGZovziM/YBsellCmsprgNA+w0CzVg==} dependencies: - cross-spawn: 5.1.0 - signal-exit: 3.0.7 + cross-spawn: 7.0.6 + signal-exit: 4.1.0 dev: true /spdx-correct@3.2.0: From f8cdf349c53facd2188d8553277701bd02c205ea Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 11:30:04 +0100 Subject: [PATCH 042/121] Update dependency draft-js to ^0.11.7 (#166) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- packages/admin/package.json | 4 ++-- pnpm-lock.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 9175aea9..3173e92c 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -42,7 +42,7 @@ "@mui/x-data-grid": "^5.17.26", "change-case": "^5.4.4", "date-fns": "^2.30.0", - "draft-js": "^0.11.0", + "draft-js": "^0.11.7", "exceljs": "^3.4.0", "file-saver": "^2.0.2", "final-form": "^4.16.1", diff --git a/packages/admin/package.json b/packages/admin/package.json index 6ff3c503..8f702403 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -56,7 +56,7 @@ "@types/react": "^17.0", "@types/react-dom": "^17.0.0", "@types/react-router": "^5.0.3", - "draft-js": "^0.11.0", + "draft-js": "^0.11.7", "eslint": "^8.0.0", "final-form": "^4.16.1", "graphql": "^15.4.0", @@ -86,7 +86,7 @@ "@mui/material": "^5.8.6", "@mui/system": "^5.8.6", "@mui/x-data-grid": "^5.17.26", - "draft-js": "^0.11.0", + "draft-js": "^0.11.7", "final-form": "^4.16.1", "graphql": "^15.4.0", "history": "^4.10.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fe4230a5..aa5c68e1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -107,7 +107,7 @@ importers: specifier: ^2.30.0 version: 2.30.0 draft-js: - specifier: ^0.11.0 + specifier: ^0.11.7 version: 0.11.7(react-dom@17.0.2)(react@17.0.2) exceljs: specifier: ^3.4.0 @@ -865,7 +865,7 @@ importers: specifier: ^5.0.3 version: 5.1.20 draft-js: - specifier: ^0.11.0 + specifier: ^0.11.7 version: 0.11.7(react-dom@17.0.2)(react@17.0.2) eslint: specifier: ^8.0.0 From a96522a958264733d013f24056759e3b5924ee9c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 08:05:30 +0100 Subject: [PATCH 043/121] Update dependency graphql-request to ^3.7.0 (#173) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- 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 e69751e3..6a4da658 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -31,7 +31,7 @@ "express": "^4.0.0", "fs-extra": "^9.0.0", "graphql": "^15.0.0", - "graphql-request": "^3.0.0", + "graphql-request": "^3.7.0", "graphql-tag": "^2.12.6", "mjml": "^4.15.3", "mjml-browser": "^4.14.1", diff --git a/demo/site/package.json b/demo/site/package.json index 1510e575..1be17980 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -35,7 +35,7 @@ "express": "^4.0.0", "fs-extra": "^9.0.0", "graphql": "^15.0.0", - "graphql-request": "^3.0.0", + "graphql-request": "^3.7.0", "graphql-tag": "^2.12.6", "next": "^14.2.0", "react": "^18.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aa5c68e1..386c0256 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -523,7 +523,7 @@ importers: specifier: ^15.0.0 version: 15.8.0 graphql-request: - specifier: ^3.0.0 + specifier: ^3.7.0 version: 3.7.0(graphql@15.8.0) graphql-tag: specifier: ^2.12.6 @@ -674,7 +674,7 @@ importers: specifier: ^15.0.0 version: 15.8.0 graphql-request: - specifier: ^3.0.0 + specifier: ^3.7.0 version: 3.7.0(graphql@15.8.0) graphql-tag: specifier: ^2.12.6 From a7d23bf164ed9fcbaa33a739c87fdfef12967fe0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 08:05:52 +0100 Subject: [PATCH 044/121] Update dependency helmet to ^7.2.0 (#175) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/server/package-lock.json | 3 ++- demo/admin/server/package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/demo/admin/server/package-lock.json b/demo/admin/server/package-lock.json index 4efdec5f..557f6b8a 100644 --- a/demo/admin/server/package-lock.json +++ b/demo/admin/server/package-lock.json @@ -9,7 +9,7 @@ "compression": "^1.7.5", "envsub": "^4.1.0", "express": "^4.17.1", - "helmet": "^7.0.0" + "helmet": "^7.2.0" }, "engines": { "node": "18" @@ -806,6 +806,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/helmet/-/helmet-7.2.0.tgz", "integrity": "sha512-ZRiwvN089JfMXokizgqEPXsl2Guk094yExfoDXR0cBYWxtBbaSww/w+vT4WEJsBW2iTUi1GgZ6swmoug3Oy4Xw==", + "license": "MIT", "engines": { "node": ">=16.0.0" } diff --git a/demo/admin/server/package.json b/demo/admin/server/package.json index 5fafc638..0f19aa5d 100644 --- a/demo/admin/server/package.json +++ b/demo/admin/server/package.json @@ -9,7 +9,7 @@ "compression": "^1.7.5", "envsub": "^4.1.0", "express": "^4.17.1", - "helmet": "^7.0.0" + "helmet": "^7.2.0" }, "engines": { "node": "18" From f1662668ed550fb60e69b90f47a1d0edfb0a215b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 08:06:13 +0100 Subject: [PATCH 045/121] Update dependency history to ^4.10.1 (#176) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- packages/admin/package.json | 4 ++-- pnpm-lock.yaml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 3173e92c..5e3486e9 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -48,7 +48,7 @@ "final-form": "^4.16.1", "graphql": "^15.4.0", "graphql-tag": "^2.0.0", - "history": "^4.10.0", + "history": "^4.10.1", "lodash.isequal": "^4.0.0", "material-design-icons": "^3.0.1", "react": "^17.0.0", diff --git a/packages/admin/package.json b/packages/admin/package.json index 8f702403..dea71c21 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -60,7 +60,7 @@ "eslint": "^8.0.0", "final-form": "^4.16.1", "graphql": "^15.4.0", - "history": "^4.10.0", + "history": "^4.10.1", "prettier": "^2.0.0", "react": "^17.0", "react-dnd": "^16.0.0", @@ -89,7 +89,7 @@ "draft-js": "^0.11.7", "final-form": "^4.16.1", "graphql": "^15.4.0", - "history": "^4.10.0", + "history": "^4.10.1", "react": "^17.0", "react-dnd": "^16.0.0", "react-dnd-html5-backend": "^16.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 386c0256..d2335138 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -125,7 +125,7 @@ importers: specifier: ^2.0.0 version: 2.12.6(graphql@15.8.0) history: - specifier: ^4.10.0 + specifier: ^4.10.1 version: 4.10.1 lodash.isequal: specifier: ^4.0.0 @@ -877,7 +877,7 @@ importers: specifier: ^15.4.0 version: 15.8.0 history: - specifier: ^4.10.0 + specifier: ^4.10.1 version: 4.10.1 prettier: specifier: ^2.0.0 @@ -10456,7 +10456,7 @@ packages: resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==} engines: {node: '>=10', npm: '>=6'} dependencies: - '@babel/runtime': 7.23.8 + '@babel/runtime': 7.24.5 cosmiconfig: 7.1.0 resolve: 1.22.8 @@ -14092,7 +14092,7 @@ packages: /history@4.10.1: resolution: {integrity: sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==} dependencies: - '@babel/runtime': 7.23.8 + '@babel/runtime': 7.24.5 loose-envify: 1.4.0 resolve-pathname: 3.0.0 tiny-invariant: 1.3.1 From b5dd10379074c4292b94b68640925284107c336f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 08:06:31 +0100 Subject: [PATCH 046/121] Update dependency hasha to ^5.2.2 (#174) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- pnpm-lock.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index fab527c7..69a1d6f7 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -83,7 +83,7 @@ "express": "^4.18.2", "file-type": "^16.0.0", "graphql": "^15.5.0", - "hasha": "^5.0.0", + "hasha": "^5.2.2", "helmet": "^4.6.0", "mime": "^2.0.0", "nestjs-console": "^8.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d2335138..4aadba3e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -378,7 +378,7 @@ importers: specifier: ^15.5.0 version: 15.8.0 hasha: - specifier: ^5.0.0 + specifier: ^5.2.2 version: 5.2.2 helmet: specifier: ^4.6.0 @@ -13338,6 +13338,7 @@ packages: /fill-range@7.0.1: resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} engines: {node: '>=8'} + requiresBuild: true dependencies: to-regex-range: 5.0.1 @@ -14760,6 +14761,7 @@ packages: /is-number@7.0.0: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} + requiresBuild: true /is-object@1.0.2: resolution: {integrity: sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==} From dd2bee2a9a3dfe8e89fbcff78661175182622650 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 08:06:49 +0100 Subject: [PATCH 047/121] Update dependency fs-extra to ^9.1.0 (#172) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- 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 6a4da658..3a5f06a1 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -29,7 +29,7 @@ "@opentelemetry/sdk-node": "^0.46.0", "draft-js": "^0.11.7", "express": "^4.0.0", - "fs-extra": "^9.0.0", + "fs-extra": "^9.1.0", "graphql": "^15.0.0", "graphql-request": "^3.7.0", "graphql-tag": "^2.12.6", diff --git a/demo/site/package.json b/demo/site/package.json index 1be17980..533622af 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -33,7 +33,7 @@ "@opentelemetry/sdk-node": "^0.46.0", "draft-js": "^0.11.7", "express": "^4.0.0", - "fs-extra": "^9.0.0", + "fs-extra": "^9.1.0", "graphql": "^15.0.0", "graphql-request": "^3.7.0", "graphql-tag": "^2.12.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4aadba3e..ac8ab587 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -517,7 +517,7 @@ importers: specifier: ^4.0.0 version: 4.20.0 fs-extra: - specifier: ^9.0.0 + specifier: ^9.1.0 version: 9.1.0 graphql: specifier: ^15.0.0 @@ -668,7 +668,7 @@ importers: specifier: ^4.0.0 version: 4.20.0 fs-extra: - specifier: ^9.0.0 + specifier: ^9.1.0 version: 9.1.0 graphql: specifier: ^15.0.0 From 1c9f0231c63a18d790cd1739b38f0a2c879ce1ea Mon Sep 17 00:00:00 2001 From: raphaelblum <44967610+raphaelblum@users.noreply.github.com> Date: Thu, 21 Nov 2024 08:19:50 +0100 Subject: [PATCH 048/121] Remove excel js - unnecessary dependency (#178) --- demo/admin/package.json | 1 - pnpm-lock.yaml | 3 --- 2 files changed, 4 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 5e3486e9..10d689b6 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -43,7 +43,6 @@ "change-case": "^5.4.4", "date-fns": "^2.30.0", "draft-js": "^0.11.7", - "exceljs": "^3.4.0", "file-saver": "^2.0.2", "final-form": "^4.16.1", "graphql": "^15.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ac8ab587..daa1c0dd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -109,9 +109,6 @@ importers: draft-js: specifier: ^0.11.7 version: 0.11.7(react-dom@17.0.2)(react@17.0.2) - exceljs: - specifier: ^3.4.0 - version: 3.10.0 file-saver: specifier: ^2.0.2 version: 2.0.5 From fe7fde5cd164023b59dfd4f2a117398fcfb09bd1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 08:20:03 +0100 Subject: [PATCH 049/121] Update Mui (#149) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 6 +- packages/admin/package.json | 8 +- pnpm-lock.yaml | 251 +++++++++++++++++++++--------------- 3 files changed, 155 insertions(+), 110 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 10d689b6..f4e2d735 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -36,9 +36,9 @@ "@emotion/styled": "^11.9.3", "@fontsource-variable/roboto-flex": "^5.1.0", "@mui/icons-material": "^5.8.4", - "@mui/lab": "^5.0.0-alpha.88", - "@mui/material": "^5.8.6", - "@mui/system": "^5.8.6", + "@mui/lab": "^5.0.0-alpha.173", + "@mui/material": "^5.16.7", + "@mui/system": "^5.16.7", "@mui/x-data-grid": "^5.17.26", "change-case": "^5.4.4", "date-fns": "^2.30.0", diff --git a/packages/admin/package.json b/packages/admin/package.json index dea71c21..87eba7c0 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -48,8 +48,8 @@ "@emotion/styled": "^11.9.3", "@graphql-codegen/cli": "^2.16.5", "@mui/icons-material": "^5.8.4", - "@mui/material": "^5.8.6", - "@mui/system": "^5.8.6", + "@mui/material": "^5.16.7", + "@mui/system": "^5.16.7", "@mui/x-data-grid": "^5.17.26", "@types/file-saver": "^2.0.7", "@types/lodash.isequal": "^4.0.0", @@ -83,8 +83,8 @@ "@emotion/react": "^11.9.3", "@emotion/styled": "^11.9.3", "@mui/icons-material": "^5.8.4", - "@mui/material": "^5.8.6", - "@mui/system": "^5.8.6", + "@mui/material": "^5.16.7", + "@mui/system": "^5.16.7", "@mui/x-data-grid": "^5.17.26", "draft-js": "^0.11.7", "final-form": "^4.16.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index daa1c0dd..13662f76 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -57,25 +57,25 @@ importers: version: 7.23.7 '@comet/admin': specifier: ^7.7.0 - version: 7.7.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) + version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0 - version: 7.7.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + version: 7.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@comet/admin-rte': specifier: ^7.7.0 - version: 7.7.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) + version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0 - version: 7.7.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) + version: 7.7.0(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@comet/blocks-admin': specifier: ^7.7.0 - version: 7.7.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) + version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0 - version: 7.7.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) + version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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) @@ -87,19 +87,19 @@ importers: 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) + version: 5.14.5(@mui/material@5.16.7)(@types/react@17.0.75)(react@17.0.2) '@mui/lab': - specifier: ^5.0.0-alpha.88 - version: 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) + specifier: ^5.0.0-alpha.173 + version: 5.0.0-alpha.173(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@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) + specifier: ^5.16.7 + version: 5.16.7(@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': - 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) + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react@17.0.2) '@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) + version: 5.17.26(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) change-case: specifier: ^5.4.4 version: 5.4.4 @@ -806,22 +806,22 @@ importers: version: 7.23.7 '@comet/admin': specifier: ^7.7.0 - version: 7.7.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) + version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0 version: 7.7.0(@babel/cli@7.23.4) '@comet/admin-date-time': specifier: ^7.7.0 - version: 7.7.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) + version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0 - version: 7.7.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) + version: 7.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@comet/blocks-admin': specifier: ^7.7.0 - version: 7.7.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) + version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0 - version: 7.7.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) + version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0 version: 7.7.0(eslint@8.56.0)(next@14.2.16)(prettier@2.8.8)(typescript@4.9.5) @@ -836,16 +836,16 @@ importers: version: 2.16.5(@babel/core@7.23.7)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5) '@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) + version: 5.14.5(@mui/material@5.16.7)(@types/react@17.0.75)(react@17.0.2) '@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) + specifier: ^5.16.7 + version: 5.16.7(@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': - 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) + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react@17.0.2) '@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) + version: 5.17.26(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@types/file-saver': specifier: ^2.0.7 version: 2.0.7 @@ -3719,7 +3719,7 @@ packages: - supports-color dev: true - /@comet/admin-date-time@7.7.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.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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-btbHQFz4Suwiur4dn9eXljY+zD/0B2xTeGnECpnixVrCCRqzflmFmPMDSVZjXv4j/npoBTEcKPhgShozvP7myQ==} peerDependencies: '@mui/material': ^5.0.0 @@ -3728,9 +3728,9 @@ packages: react-final-form: ^6.5.7 react-intl: ^5.0.0 || ^6.0.0 dependencies: - '@comet/admin': 7.7.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.7.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) + '@comet/admin': 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) + '@mui/material': 5.16.7(@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 date-fns: 2.30.0 @@ -3755,20 +3755,20 @@ packages: - react-router - react-router-dom - /@comet/admin-icons@7.7.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2): + /@comet/admin-icons@7.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2): resolution: {integrity: sha512-91zniX6PDnesOWe/1E9BpO3XlewqtNcsoDeaPE1IgpkIjlsio/gBBniWgEHTxq7xovMxIi2mlDnTX9+c8VW+cQ==} peerDependencies: '@mui/material': ^5.0.0 react: ^17.0 react-dom: ^17.0 dependencies: - '@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/material': 5.16.7(@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.7.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-rte@7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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-ic6Xu/J6YUcz6DgO6J/AKMCxLLjjBS3cteVSuQMKMMkxMiAezoUhGtFUvLd1GH/ST57aE4wwB4pdPVItWTgaig==} peerDependencies: '@mui/material': ^5.0.0 @@ -3779,9 +3779,9 @@ packages: react-final-form: ^6.3.1 react-intl: ^5.0.0 || ^6.0.0 dependencies: - '@comet/admin': 7.7.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.7.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) + '@comet/admin': 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) + '@mui/material': 5.16.7(@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) draft-js-export-html: 1.4.1(draft-js@0.11.7)(immutable@3.7.6) @@ -3808,23 +3808,23 @@ packages: - react-router - react-router-dom - /@comet/admin-theme@7.7.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/admin-theme@7.7.0(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2): resolution: {integrity: sha512-lLnie286ww2eOtKonOKloTR2BvJN9AD7Qk8/HtpaYYJmrlZrvNWSkBJ0VF0EY99mTq8vnz8Rt4oxq8e3otyusw==} peerDependencies: '@mui/material': ^5.0.0 '@mui/system': ^5.0.0 react: ^17.0 dependencies: - '@comet/admin-icons': 7.7.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) + '@comet/admin-icons': 7.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) + '@mui/material': 5.16.7(@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.16.7(@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 transitivePeerDependencies: - '@types/react' - react-dom - /@comet/admin@7.7.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@7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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-CXw8EgFjbRaIUdEKdBjbSOHY4GyTxqqe4ZxSyvgwosrpG6t0eD/4sknvSEwQMSPVl3FsJzeuoQkDj8yX0f/YDQ==} peerDependencies: '@apollo/client': ^3.7.0 @@ -3853,14 +3853,14 @@ packages: optional: true dependencies: '@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.7.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) - '@comet/admin-theme': 7.7.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/admin-icons': 7.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin-theme': 7.7.0(@mui/material@5.16.7)(@mui/system@5.16.7)(@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) - '@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/lab': 5.0.0-alpha.173(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) + '@mui/material': 5.16.7(@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/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) + '@mui/x-data-grid': 5.17.26(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) clsx: 1.2.1 exceljs: 3.10.0 file-saver: 2.0.5 @@ -3887,7 +3887,7 @@ packages: - '@mui/system' - '@types/react' - /@comet/blocks-admin@7.7.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/blocks-admin@7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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-J2IJccacYuiJSehTEfeV4hKTTQtl8HvPF8+BwFAItxNirTBi5arSb73Gcg3W2bawi1mf0uHtFE39SMK+Kn+58g==} peerDependencies: '@mui/material': ^5.0.0 @@ -3899,10 +3899,10 @@ packages: react-router: ^5.0.0 react-router-dom: ^5.0.0 dependencies: - '@comet/admin': 7.7.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.7.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) + '@comet/admin': 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) + '@mui/lab': 5.0.0-alpha.173(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) + '@mui/material': 5.16.7(@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 clsx: 1.2.1 lodash.isequal: 4.5.0 @@ -3950,7 +3950,7 @@ packages: ts-node: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) dev: true - /@comet/cms-admin@7.7.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/cms-admin@7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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-FARsHyD2+c6ba1yObRG4yosJ7eJPT1Tnx6vLrdriCcsy6T5rGZLr1oJKT5rNKkb/Yw+SbNXrqEvIes+8jpBVHw==} hasBin: true peerDependencies: @@ -3971,20 +3971,20 @@ packages: react-router-dom: ^5.0.0 dependencies: '@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.7.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.7.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.7.0(@mui/material@5.15.5)(react-dom@17.0.2)(react@17.0.2) - '@comet/admin-rte': 7.7.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.7.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.7.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': 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin-rte': 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) + '@comet/blocks-admin': 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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/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/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) + '@mui/lab': 5.0.0-alpha.173(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) + '@mui/material': 5.16.7(@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/x-data-grid': 5.17.26(@mui/material@5.16.7)(@mui/system@5.16.7)(@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 @@ -4505,8 +4505,8 @@ packages: '@floating-ui/core': 1.5.3 '@floating-ui/utils': 0.2.1 - /@floating-ui/react-dom@2.0.6(react-dom@17.0.2)(react@17.0.2): - resolution: {integrity: sha512-IB8aCRFxr8nFkdYZgH+Otd9EVQPJoynxeFRGTB8voPoZMRWo8XjYuCRgpI1btvuKY69XMiLnW+ym7zoBHM90Rw==} + /@floating-ui/react-dom@2.1.2(react-dom@17.0.2)(react@17.0.2): + resolution: {integrity: sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==} peerDependencies: react: '>=16.8.0' react-dom: '>=16.8.0' @@ -6348,8 +6348,8 @@ packages: - supports-color - tedious - /@mui/base@5.0.0-beta.32(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2): - resolution: {integrity: sha512-4VptvYeLUYMJhZapWBkD50GmKfOc0XT381KJcTK3ncZYIl8MdBhpR6l8jOyeP5cixUPBJhstjrnmQEAHjCLriw==} + /@mui/base@5.0.0-beta.40(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2): + resolution: {integrity: sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ==} engines: {node: '>=12.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 @@ -6360,9 +6360,9 @@ packages: optional: true dependencies: '@babel/runtime': 7.24.5 - '@floating-ui/react-dom': 2.0.6(react-dom@17.0.2)(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) + '@floating-ui/react-dom': 2.1.2(react-dom@17.0.2)(react@17.0.2) + '@mui/types': 7.2.19(@types/react@17.0.75) + '@mui/utils': 5.16.6(@types/react@17.0.75)(react@17.0.2) '@popperjs/core': 2.11.8 '@types/react': 17.0.75 clsx: 2.1.0 @@ -6370,10 +6370,10 @@ packages: react: 17.0.2 react-dom: 17.0.2(react@17.0.2) - /@mui/core-downloads-tracker@5.15.5: - resolution: {integrity: sha512-VhT8klyXy8GrWrARqLMoM6Nzz809Jc3Wn5wd7WOZfre2vFO1rBV1dBANAPBhBqpaQI0HCMRTWEYoSyOFgRnz4A==} + /@mui/core-downloads-tracker@5.16.7: + resolution: {integrity: sha512-RtsCt4Geed2/v74sbihWzzRs+HsIQCfclHeORh5Ynu2fS4icIKozcSubwuG7vtzq2uW3fOR1zITSP84TNt2GoQ==} - /@mui/icons-material@5.14.5(@mui/material@5.15.5)(@types/react@17.0.75)(react@17.0.2): + /@mui/icons-material@5.14.5(@mui/material@5.16.7)(@types/react@17.0.75)(react@17.0.2): resolution: {integrity: sha512-OLvC3JKtBj1PO4QWVxOqULcq/oQP9SRw2SD+G5IXnthcFG0ZCFPIgAe1TI3Lo9N+96R0jRDI0plRc/unubjWHA==} engines: {node: '>=12.0.0'} peerDependencies: @@ -6385,12 +6385,12 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.8 - '@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/material': 5.16.7(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@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): - resolution: {integrity: sha512-dLWWZrJAi44av+iiqEHpZHfPhZ4DM42ItS31yqBwboroawumG2GUyYvHVTyEFXM1Zr8+kufiZ9t28rqHXVf5+w==} + /@mui/lab@5.0.0-alpha.173(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2): + resolution: {integrity: sha512-Gt5zopIWwxDgGy/MXcp6GueD84xFFugFai4hYiXY0zowJpTVnIrTQCQXV004Q7rejJ7aaCntX9hpPJqCrioshA==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -6407,22 +6407,22 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.8 + '@babel/runtime': 7.24.5 '@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/base': 5.0.0-beta.32(@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/system': 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@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) + '@mui/base': 5.0.0-beta.40(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) + '@mui/material': 5.16.7(@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.16.7(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react@17.0.2) + '@mui/types': 7.2.19(@types/react@17.0.75) + '@mui/utils': 5.16.6(@types/react@17.0.75)(react@17.0.2) '@types/react': 17.0.75 clsx: 2.1.0 prop-types: 15.8.1 react: 17.0.2 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): - resolution: {integrity: sha512-2KfA39f/UWeQl0O22UJs3x1nG3chYlyu9wnux5vTnxUTLzkgYIzQIHaH+ZOGpv5JiZBMKktAPNfhqyhSaQ49qQ==} + /@mui/material@5.16.7(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2): + resolution: {integrity: sha512-cwwVQxBhK60OIOqZOVLFt55t01zmarKJiJUWbk0+8s/Ix5IaUzAShqlJchxsIQ4mSrWqgcKCCXKtIlG5H+/Jmg==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -6438,14 +6438,14 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.8 + '@babel/runtime': 7.24.5 '@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/base': 5.0.0-beta.32(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) - '@mui/core-downloads-tracker': 5.15.5 - '@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/types': 7.2.13(@types/react@17.0.75) - '@mui/utils': 5.15.5(@types/react@17.0.75)(react@17.0.2) + '@mui/core-downloads-tracker': 5.16.7 + '@mui/system': 5.16.7(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react@17.0.2) + '@mui/types': 7.2.19(@types/react@17.0.75) + '@mui/utils': 5.16.6(@types/react@17.0.75)(react@17.0.2) + '@popperjs/core': 2.11.8 '@types/react': 17.0.75 '@types/react-transition-group': 4.4.10 clsx: 2.1.0 @@ -6453,7 +6453,7 @@ packages: prop-types: 15.8.1 react: 17.0.2 react-dom: 17.0.2(react@17.0.2) - react-is: 18.2.0 + react-is: 18.3.1 react-transition-group: 4.4.5(react-dom@17.0.2)(react@17.0.2) /@mui/private-theming@5.15.5(@types/react@17.0.75)(react@17.0.2): @@ -6472,8 +6472,24 @@ packages: prop-types: 15.8.1 react: 17.0.2 - /@mui/styled-engine@5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(react@17.0.2): - resolution: {integrity: sha512-xoMUd8h270thNL7ZsOzmlluIAMsQg/HT7SCdRjPBVle+XHgTKaiWiRy1ekDOsrrF0rhjME3T7xeeUq2G269UUw==} + /@mui/private-theming@5.16.6(@types/react@17.0.75)(react@17.0.2): + resolution: {integrity: sha512-rAk+Rh8Clg7Cd7shZhyt2HGTTE5wYKNSJ5sspf28Fqm/PZ69Er9o6KX25g03/FG2dfpg5GCwZh/xOojiTfm3hw==} + engines: {node: '>=12.0.0'} + peerDependencies: + '@types/react': ^17.0.0 || ^18.0.0 + react: ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + '@types/react': + optional: true + dependencies: + '@babel/runtime': 7.24.5 + '@mui/utils': 5.16.6(@types/react@17.0.75)(react@17.0.2) + '@types/react': 17.0.75 + prop-types: 15.8.1 + react: 17.0.2 + + /@mui/styled-engine@5.16.6(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(react@17.0.2): + resolution: {integrity: sha512-zaThmS67ZmtHSWToTiHslbI8jwrmITcN93LQaR2lKArbvS7Z3iLkwRoiikNWutx9MBs8Q6okKvbZq1RQYB3v7g==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.4.1 @@ -6493,8 +6509,8 @@ packages: 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==} + /@mui/system@5.16.7(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react@17.0.2): + resolution: {integrity: sha512-Jncvs/r/d/itkxh7O7opOunTqbbSSzMTHzZkNLM+FjAOg+cYAZHrPDlYe1ZGKUYORwwb2XexlWnpZp0kZ4AHuA==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -6509,23 +6525,23 @@ packages: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.8 + '@babel/runtime': 7.24.5 '@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/private-theming': 5.15.5(@types/react@17.0.75)(react@17.0.2) - '@mui/styled-engine': 5.15.5(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(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) + '@mui/private-theming': 5.16.6(@types/react@17.0.75)(react@17.0.2) + '@mui/styled-engine': 5.16.6(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(react@17.0.2) + '@mui/types': 7.2.19(@types/react@17.0.75) + '@mui/utils': 5.16.6(@types/react@17.0.75)(react@17.0.2) '@types/react': 17.0.75 clsx: 2.1.0 csstype: 3.1.3 prop-types: 15.8.1 react: 17.0.2 - /@mui/types@7.2.13(@types/react@17.0.75): - resolution: {integrity: sha512-qP9OgacN62s+l8rdDhSFRe05HWtLLJ5TGclC9I1+tQngbssu0m2dmFZs+Px53AcOs9fD7TbYd4gc9AXzVqO/+g==} + /@mui/types@7.2.19(@types/react@17.0.75): + resolution: {integrity: sha512-6XpZEM/Q3epK9RN8ENoXuygnqUQxE+siN/6rGRi2iwJPgBUR25mphYQ9ZI87plGh58YoZ5pp40bFvKYOCDJ3tA==} peerDependencies: - '@types/react': ^17.0.0 || ^18.0.0 + '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@types/react': optional: true @@ -6549,7 +6565,26 @@ packages: react: 17.0.2 react-is: 18.2.0 - /@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): + /@mui/utils@5.16.6(@types/react@17.0.75)(react@17.0.2): + resolution: {integrity: sha512-tWiQqlhxAt3KENNiSRL+DIn9H5xNVK6Jjf70x3PnfQPz1MPBdh7yyIcAyVBT9xiw7hP3SomRhPR7hzBMBCjqEA==} + engines: {node: '>=12.0.0'} + peerDependencies: + '@types/react': ^17.0.0 || ^18.0.0 + react: ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + '@types/react': + optional: true + dependencies: + '@babel/runtime': 7.24.5 + '@mui/types': 7.2.19(@types/react@17.0.75) + '@types/prop-types': 15.7.13 + '@types/react': 17.0.75 + clsx: 2.1.1 + prop-types: 15.8.1 + react: 17.0.2 + react-is: 18.3.1 + + /@mui/x-data-grid@5.17.26(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2): resolution: {integrity: sha512-eGJq9J0g9cDGLFfMmugOadZx0mJeOd/yQpHwEa5gUXyONS6qF0OhXSWyDOhDdA3l2TOoQzotMN5dY/T4Wl1KYA==} engines: {node: '>=12.0.0'} peerDependencies: @@ -6559,8 +6594,8 @@ packages: react-dom: ^17.0.2 || ^18.0.0 dependencies: '@babel/runtime': 7.23.8 - '@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/material': 5.16.7(@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.16.7(@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) clsx: 1.2.1 prop-types: 15.8.1 @@ -9130,6 +9165,9 @@ packages: /@types/prop-types@15.7.11: resolution: {integrity: sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==} + /@types/prop-types@15.7.13: + resolution: {integrity: sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==} + /@types/qs@6.9.11: resolution: {integrity: sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ==} @@ -11286,6 +11324,10 @@ packages: resolution: {integrity: sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==} engines: {node: '>=6'} + /clsx@2.1.1: + resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==} + engines: {node: '>=6'} + /co@4.6.0: resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==} engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'} @@ -18863,6 +18905,9 @@ packages: /react-is@18.2.0: resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} + /react-is@18.3.1: + resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==} + /react-list@0.8.17(react@17.0.2): resolution: {integrity: sha512-pgmzGi0G5uGrdHzMhgO7KR1wx5ZXVvI3SsJUmkblSAKtewIhMwbQiMuQiTE83ozo04BQJbe0r3WIWzSO0dR1xg==} peerDependencies: From f2b6a2ba9c8dc6dc81524c09926d90a220b9d0e0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 08:20:30 +0100 Subject: [PATCH 050/121] Update dependency exifr to ^6.3.0 (#168) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index 69a1d6f7..22417dbe 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -79,7 +79,7 @@ "commander": "^7.2.0", "compression": "^1.7.5", "cookie-parser": "^1.4.7", - "exifr": "^6.0.0", + "exifr": "^6.3.0", "express": "^4.18.2", "file-type": "^16.0.0", "graphql": "^15.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 13662f76..5c985908 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -363,7 +363,7 @@ importers: specifier: ^1.4.7 version: 1.4.7 exifr: - specifier: ^6.0.0 + specifier: ^6.3.0 version: 6.3.0 express: specifier: ^4.18.2 From 62e345bbe24bc37ffe2d60def563aac519f1c7b4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 08:21:48 +0100 Subject: [PATCH 051/121] Update dependency html-webpack-plugin to ^5.6.3 (#177) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index f4e2d735..47b99459 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -88,7 +88,7 @@ "css-loader": "^6.0.0", "dotenv-cli": "^6.0.0", "eslint": "^8.0.0", - "html-webpack-plugin": "^5.0.0", + "html-webpack-plugin": "^5.6.3", "npm-run-all2": "^5.0.0", "prettier": "^2.2.1", "rimraf": "^3.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5c985908..10e4d181 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -240,8 +240,8 @@ importers: specifier: ^8.0.0 version: 8.56.0 html-webpack-plugin: - specifier: ^5.0.0 - version: 5.6.0(webpack@5.94.0) + specifier: ^5.6.3 + version: 5.6.3(webpack@5.94.0) npm-run-all2: specifier: ^5.0.0 version: 5.0.2 @@ -14215,8 +14215,8 @@ packages: uglify-js: 3.17.4 dev: false - /html-webpack-plugin@5.6.0(webpack@5.94.0): - resolution: {integrity: sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==} + /html-webpack-plugin@5.6.3(webpack@5.94.0): + resolution: {integrity: sha512-QSf1yjtSAsmf7rYBV7XX86uua4W/vkhIt0xNXKbsi2foEeW7vjJQz4bhnpL3xH+l1ryl1680uNv968Z+X6jSYg==} engines: {node: '>=10.13.0'} peerDependencies: '@rspack/core': 0.x || 1.x From ed232c733c83cfb2c08ab11e11e5385561b71749 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 08:22:04 +0100 Subject: [PATCH 052/121] Update dependency file-type to ^16.5.4 (#170) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index 22417dbe..d26f974f 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -81,7 +81,7 @@ "cookie-parser": "^1.4.7", "exifr": "^6.3.0", "express": "^4.18.2", - "file-type": "^16.0.0", + "file-type": "^16.5.4", "graphql": "^15.5.0", "hasha": "^5.2.2", "helmet": "^4.6.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 10e4d181..f7d33b5c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -369,7 +369,7 @@ importers: specifier: ^4.18.2 version: 4.20.0 file-type: - specifier: ^16.0.0 + specifier: ^16.5.4 version: 16.5.4 graphql: specifier: ^15.5.0 From 86f2fc49263ab763600751721d9d0eed1b8bf73f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 08:22:31 +0100 Subject: [PATCH 053/121] Update dependency husky to ^7.0.4 (#179) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 82c4e8f9..d0198d9c 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "@formatjs/cli": "^4.8.3", "@types/node": "^18.0.0", "dotenv-cli": "^6.0.0", - "husky": "^7.0.1", + "husky": "^7.0.4", "lint-staged": "^12.3.7", "npm-run-all2": "^5.0.0", "open-cli": "^7.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f7d33b5c..08ad5b0b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -26,7 +26,7 @@ importers: specifier: ^6.0.0 version: 6.0.0 husky: - specifier: ^7.0.1 + specifier: ^7.0.4 version: 7.0.4 lint-staged: specifier: ^12.3.7 From 5d2aafd5debc1084c7577374e25b69cdcf4f1942 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 09:15:59 +0100 Subject: [PATCH 054/121] Update dependency file-saver to ^2.0.5 (#169) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 47b99459..dd8ae678 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -43,7 +43,7 @@ "change-case": "^5.4.4", "date-fns": "^2.30.0", "draft-js": "^0.11.7", - "file-saver": "^2.0.2", + "file-saver": "^2.0.5", "final-form": "^4.16.1", "graphql": "^15.4.0", "graphql-tag": "^2.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 08ad5b0b..c345bc7c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -110,7 +110,7 @@ importers: specifier: ^0.11.7 version: 0.11.7(react-dom@17.0.2)(react@17.0.2) file-saver: - specifier: ^2.0.2 + specifier: ^2.0.5 version: 2.0.5 final-form: specifier: ^4.16.1 From 00417d9b9f37fd8ad4d2ea113e7f2be80e961ffa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 09:26:06 +0100 Subject: [PATCH 055/121] Update dependency lint-staged to ^12.5.0 (#180) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 100 +++++++++++++++++++++++-------------------------- 2 files changed, 47 insertions(+), 55 deletions(-) diff --git a/package.json b/package.json index d0198d9c..5fb39a11 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@types/node": "^18.0.0", "dotenv-cli": "^6.0.0", "husky": "^7.0.4", - "lint-staged": "^12.3.7", + "lint-staged": "^12.5.0", "npm-run-all2": "^5.0.0", "open-cli": "^7.0.0", "prettier": "^2.3.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c345bc7c..55bdd2b6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -29,7 +29,7 @@ importers: specifier: ^7.0.4 version: 7.0.4 lint-staged: - specifier: ^12.3.7 + specifier: ^12.5.0 version: 12.5.0 npm-run-all2: specifier: ^5.0.0 @@ -2117,7 +2117,7 @@ packages: '@babel/traverse': 7.23.7 '@babel/types': 7.23.6 convert-source-map: 2.0.0 - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.4 gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 @@ -2195,7 +2195,7 @@ packages: '@babel/core': 7.23.7 '@babel/helper-compilation-targets': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) lodash.debounce: 4.0.8 resolve: 1.22.8 transitivePeerDependencies: @@ -3493,7 +3493,7 @@ packages: '@babel/helper-split-export-declaration': 7.22.6 '@babel/parser': 7.23.6 '@babel/types': 7.23.6 - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -4427,7 +4427,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) espree: 9.6.1 globals: 13.24.0 ignore: 5.3.0 @@ -5171,7 +5171,7 @@ packages: '@graphql-tools/utils': 9.2.1(graphql@15.8.0) graphql: 15.8.0 is-glob: 4.0.3 - micromatch: 4.0.5 + micromatch: 4.0.8 tslib: 2.8.1 unixify: 1.0.0 transitivePeerDependencies: @@ -5321,7 +5321,7 @@ packages: '@types/json-stable-stringify': 1.0.36 '@whatwg-node/fetch': 0.8.8 chalk: 4.1.2 - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) dotenv: 16.4.5 graphql: 15.8.0 graphql-request: 6.1.0(graphql@15.8.0) @@ -5564,7 +5564,7 @@ packages: engines: {node: '>=10.10.0'} dependencies: '@humanwhocodes/object-schema': 2.0.2 - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -5965,7 +5965,7 @@ packages: jest-haste-map: 27.5.1 jest-regex-util: 27.5.1 jest-util: 27.5.1 - micromatch: 4.0.5 + micromatch: 4.0.8 pirates: 4.0.6 slash: 3.0.0 source-map: 0.6.1 @@ -9355,7 +9355,7 @@ packages: '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/type-utils': 5.62.0(eslint@8.56.0)(typescript@4.9.5) '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@4.9.5) - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) eslint: 8.56.0 graphemer: 1.4.0 ignore: 5.3.0 @@ -9380,7 +9380,7 @@ packages: '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.9.5) - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) eslint: 8.56.0 typescript: 4.9.5 transitivePeerDependencies: @@ -9415,7 +9415,7 @@ packages: dependencies: '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.9.5) '@typescript-eslint/utils': 5.62.0(eslint@8.56.0)(typescript@4.9.5) - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) eslint: 8.56.0 tsutils: 3.21.0(typescript@4.9.5) typescript: 4.9.5 @@ -9444,7 +9444,7 @@ packages: dependencies: '@typescript-eslint/types': 5.62.0 '@typescript-eslint/visitor-keys': 5.62.0 - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.4 @@ -9465,7 +9465,7 @@ packages: dependencies: '@typescript-eslint/types': 6.19.0 '@typescript-eslint/visitor-keys': 6.19.0 - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) globby: 11.1.0 is-glob: 4.0.3 minimatch: 9.0.3 @@ -9899,7 +9899,7 @@ packages: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} dependencies: - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) transitivePeerDependencies: - supports-color dev: true @@ -9908,7 +9908,7 @@ packages: resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==} engines: {node: '>= 14'} dependencies: - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) transitivePeerDependencies: - supports-color @@ -10817,7 +10817,6 @@ packages: engines: {node: '>=8'} dependencies: fill-range: 7.1.1 - dev: true /browser-process-hrtime@1.0.0: resolution: {integrity: sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==} @@ -11134,7 +11133,7 @@ packages: requiresBuild: true dependencies: anymatch: 3.1.3 - braces: 3.0.2 + braces: 3.0.3 glob-parent: 5.1.2 is-binary-path: 2.1.0 is-glob: 4.0.3 @@ -11700,7 +11699,6 @@ packages: path-key: 3.1.1 shebang-command: 2.0.0 which: 2.0.2 - dev: true /crypto-random-string@4.0.0: resolution: {integrity: sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==} @@ -11860,7 +11858,7 @@ packages: dependencies: ms: 2.1.3 - /debug@4.3.4(supports-color@9.4.0): + /debug@4.3.4: resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} peerDependencies: @@ -11870,9 +11868,8 @@ packages: optional: true dependencies: ms: 2.1.2 - supports-color: 9.4.0 - /debug@4.3.7: + /debug@4.3.7(supports-color@9.4.0): resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==} engines: {node: '>=6.0'} peerDependencies: @@ -11882,6 +11879,7 @@ packages: optional: true dependencies: ms: 2.1.3 + supports-color: 9.4.0 /decamelize-keys@1.1.1: resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==} @@ -12623,7 +12621,7 @@ packages: eslint: '*' eslint-plugin-import: '*' dependencies: - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) enhanced-resolve: 5.15.0 eslint: 8.56.0 eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.56.0) @@ -12900,7 +12898,7 @@ packages: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.4 doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.2.2 @@ -13012,7 +13010,7 @@ packages: resolution: {integrity: sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==} engines: {node: '>=10'} dependencies: - cross-spawn: 7.0.3 + cross-spawn: 7.0.6 get-stream: 5.2.0 human-signals: 1.1.1 is-stream: 2.0.1 @@ -13027,7 +13025,7 @@ packages: resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} engines: {node: '>=10'} dependencies: - cross-spawn: 7.0.3 + cross-spawn: 7.0.6 get-stream: 6.0.1 human-signals: 2.1.0 is-stream: 2.0.1 @@ -13041,7 +13039,7 @@ packages: resolution: {integrity: sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==} engines: {node: ^14.18.0 || ^16.14.0 || >=18.0.0} dependencies: - cross-spawn: 7.0.3 + cross-spawn: 7.0.6 get-stream: 6.0.1 human-signals: 4.3.1 is-stream: 3.0.0 @@ -13217,7 +13215,7 @@ packages: '@nodelib/fs.walk': 1.2.8 glob-parent: 5.1.2 merge2: 1.4.1 - micromatch: 4.0.5 + micromatch: 4.0.8 /fast-glob@3.3.2: resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==} @@ -13386,7 +13384,6 @@ packages: engines: {node: '>=8'} dependencies: to-regex-range: 5.0.1 - dev: true /filter-obj@1.1.0: resolution: {integrity: sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==} @@ -13972,7 +13969,7 @@ packages: peerDependencies: graphql: '>=0.9 <0.14 || ^14.0.2 || ^15.4.0 || ^16.3.0' dependencies: - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) graphql: 15.8.0 tslib: 2.8.1 transitivePeerDependencies: @@ -14304,7 +14301,7 @@ packages: dependencies: '@tootallnate/once': 1.1.2 agent-base: 6.0.2 - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) transitivePeerDependencies: - supports-color dev: true @@ -14314,7 +14311,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.0 - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) transitivePeerDependencies: - supports-color dev: true @@ -14324,7 +14321,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.0 - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) transitivePeerDependencies: - supports-color @@ -14342,7 +14339,7 @@ packages: http-proxy: 1.18.1 is-glob: 4.0.3 is-plain-obj: 3.0.0 - micromatch: 4.0.5 + micromatch: 4.0.8 transitivePeerDependencies: - debug @@ -14379,7 +14376,7 @@ packages: engines: {node: '>= 6'} dependencies: agent-base: 6.0.2 - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) transitivePeerDependencies: - supports-color dev: true @@ -14389,7 +14386,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.0 - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) transitivePeerDependencies: - supports-color dev: true @@ -14399,7 +14396,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.0 - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) transitivePeerDependencies: - supports-color @@ -15028,7 +15025,7 @@ packages: resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==} engines: {node: '>=10'} dependencies: - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) istanbul-lib-coverage: 3.2.2 source-map: 0.6.1 transitivePeerDependencies: @@ -15228,7 +15225,7 @@ packages: jest-runner: 27.5.1 jest-util: 27.5.1 jest-validate: 27.5.1 - micromatch: 4.0.5 + micromatch: 4.0.8 parse-json: 5.2.0 pretty-format: 27.5.1 slash: 3.0.0 @@ -15404,7 +15401,7 @@ packages: jest-serializer: 27.5.1 jest-util: 27.5.1 jest-worker: 27.5.1 - micromatch: 4.0.5 + micromatch: 4.0.8 walker: 1.0.8 optionalDependencies: fsevents: 2.3.3 @@ -15519,7 +15516,7 @@ packages: '@types/stack-utils': 2.0.3 chalk: 4.1.2 graceful-fs: 4.2.11 - micromatch: 4.0.5 + micromatch: 4.0.8 pretty-format: 27.5.1 slash: 3.0.0 stack-utils: 2.0.6 @@ -16258,7 +16255,7 @@ packages: dependencies: '@types/express': 4.17.21 '@types/jsonwebtoken': 9.0.5 - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) jose: 4.15.9 limiter: 1.1.5 lru-memoizer: 2.2.0 @@ -16315,7 +16312,7 @@ packages: dependencies: colorette: 2.0.19 commander: 10.0.1 - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.4 escalade: 3.2.0 esm: 3.2.25 get-package-type: 0.1.0 @@ -16397,13 +16394,13 @@ packages: cli-truncate: 3.1.0 colorette: 2.0.20 commander: 9.5.0 - debug: 4.3.4(supports-color@9.4.0) + debug: 4.3.7(supports-color@9.4.0) execa: 5.1.1 lilconfig: 2.0.5 listr2: 4.0.5 - micromatch: 4.0.5 + micromatch: 4.0.8 normalize-path: 3.0.0 - object-inspect: 1.13.1 + object-inspect: 1.13.3 pidtree: 0.5.0 string-argv: 0.3.2 supports-color: 9.4.0 @@ -16849,7 +16846,6 @@ packages: dependencies: braces: 3.0.3 picomatch: 2.3.1 - dev: true /mikro-orm@5.9.8: resolution: {integrity: sha512-iBku1gU9xkA2FCw2wy0K4x3EQzsRE52dYGkGUVQEthRmc/vIMBwXyiTAj+oARzXrkWqslFtlZA/2upeqZhMQlw==} @@ -17708,10 +17704,6 @@ packages: requiresBuild: true optional: true - /object-inspect@1.13.1: - resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==} - dev: true - /object-inspect@1.13.3: resolution: {integrity: sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==} engines: {node: '>= 0.4'} @@ -19288,7 +19280,7 @@ packages: resolution: {integrity: sha512-3TLx5TGyAY6AOqLBoXmHkNql0HIf2RGbuMgCDT2WO/uGVAPJs6h7Kl+bN6TIZGd9bWhWPwnDnTHGtW8Iu77sdw==} engines: {node: '>=8.6.0'} dependencies: - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) module-details-from-path: 1.0.3 resolve: 1.22.8 transitivePeerDependencies: @@ -19930,7 +19922,7 @@ packages: /spdy-transport@3.0.0: resolution: {integrity: sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==} dependencies: - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) detect-node: 2.1.0 hpack.js: 2.1.6 obuf: 1.1.2 @@ -19943,7 +19935,7 @@ packages: resolution: {integrity: sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==} engines: {node: '>=6.0.0'} dependencies: - debug: 4.3.7 + debug: 4.3.7(supports-color@9.4.0) handle-thing: 2.0.1 http-deceiver: 1.2.7 select-hose: 2.0.0 From 6470019e6514ec4e4e5239b366f38668ae67c71a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 09:26:22 +0100 Subject: [PATCH 056/121] Update dependency lodash.isequal to ^4.5.0 (#181) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- packages/admin/package.json | 2 +- pnpm-lock.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index dd8ae678..885cafff 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -48,7 +48,7 @@ "graphql": "^15.4.0", "graphql-tag": "^2.0.0", "history": "^4.10.1", - "lodash.isequal": "^4.0.0", + "lodash.isequal": "^4.5.0", "material-design-icons": "^3.0.1", "react": "^17.0.0", "react-app-polyfill": "^2.0.0", diff --git a/packages/admin/package.json b/packages/admin/package.json index 87eba7c0..317c115e 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -30,7 +30,7 @@ "dependencies": { "date-fns": "^2.30.0", "file-saver": "^2.0.5", - "lodash.isequal": "^4.0.0", + "lodash.isequal": "^4.5.0", "react-dropzone": "^14.2.3" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 55bdd2b6..8815244c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -125,7 +125,7 @@ importers: specifier: ^4.10.1 version: 4.10.1 lodash.isequal: - specifier: ^4.0.0 + specifier: ^4.5.0 version: 4.5.0 material-design-icons: specifier: ^3.0.1 @@ -789,7 +789,7 @@ importers: specifier: ^2.0.5 version: 2.0.5 lodash.isequal: - specifier: ^4.0.0 + specifier: ^4.5.0 version: 4.5.0 react-dropzone: specifier: ^14.2.3 From e70d51cfa6629e5d1b4a3da0945915903a0030b9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 14:27:47 +0100 Subject: [PATCH 057/121] Update dependency mime to ^2.6.0 (#182) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- pnpm-lock.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index d26f974f..5e207c8f 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -85,7 +85,7 @@ "graphql": "^15.5.0", "hasha": "^5.2.2", "helmet": "^4.6.0", - "mime": "^2.0.0", + "mime": "^2.6.0", "nestjs-console": "^8.0.0", "node-cache": "^5.1.2", "node-fetch": "^2.6.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8815244c..64d9c5b1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -381,7 +381,7 @@ importers: specifier: ^4.6.0 version: 4.6.0 mime: - specifier: ^2.0.0 + specifier: ^2.6.0 version: 2.6.0 nestjs-console: specifier: ^8.0.0 @@ -13382,6 +13382,7 @@ packages: /fill-range@7.1.1: resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} engines: {node: '>=8'} + requiresBuild: true dependencies: to-regex-range: 5.0.1 From 0e179c597dad1461a6b0ec9af80f087100f7b243 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 15:05:15 +0100 Subject: [PATCH 058/121] Update dependency mjml-browser to ^4.15.3 (#183) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/campaign/package.json | 2 +- pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/campaign/package.json b/demo/campaign/package.json index 3a5f06a1..f8e3bc20 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -34,7 +34,7 @@ "graphql-request": "^3.7.0", "graphql-tag": "^2.12.6", "mjml": "^4.15.3", - "mjml-browser": "^4.14.1", + "mjml-browser": "^4.15.3", "next": "^14.2.0", "react": "^18.0.0", "react-dom": "^18.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 64d9c5b1..b827dc91 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -529,7 +529,7 @@ importers: specifier: ^4.15.3 version: 4.15.3 mjml-browser: - specifier: ^4.14.1 + specifier: ^4.15.3 version: 4.15.3 next: specifier: ^14.2.0 From 719706b7bf63820ae4a405f8f49ae099f31f5a56 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 15:29:18 +0100 Subject: [PATCH 059/121] Update dependency npm-run-all2 to ^5.0.2 (#187) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- demo/campaign/package.json | 2 +- demo/site/package.json | 2 +- package.json | 2 +- pnpm-lock.yaml | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 885cafff..b1abccd7 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -89,7 +89,7 @@ "dotenv-cli": "^6.0.0", "eslint": "^8.0.0", "html-webpack-plugin": "^5.6.3", - "npm-run-all2": "^5.0.0", + "npm-run-all2": "^5.0.2", "prettier": "^2.2.1", "rimraf": "^3.0.0", "style-loader": "^3.0.0", diff --git a/demo/campaign/package.json b/demo/campaign/package.json index f8e3bc20..1161d119 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -67,7 +67,7 @@ "chokidar-cli": "^2.1.0", "dotenv-cli": "^6.0.0", "eslint": "^8.0.0", - "npm-run-all2": "^5.0.0", + "npm-run-all2": "^5.0.2", "prettier": "^2.0.0", "rimraf": "^3.0.0", "tsconfig-paths": "^3.0.0", diff --git a/demo/site/package.json b/demo/site/package.json index 533622af..dd884b28 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -68,7 +68,7 @@ "chokidar-cli": "^2.1.0", "dotenv-cli": "^6.0.0", "eslint": "^8.0.0", - "npm-run-all2": "^5.0.0", + "npm-run-all2": "^5.0.2", "prettier": "^2.0.0", "rimraf": "^3.0.0", "tsconfig-paths": "^3.0.0", diff --git a/package.json b/package.json index 5fb39a11..bd5e03b2 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "dotenv-cli": "^6.0.0", "husky": "^7.0.4", "lint-staged": "^12.5.0", - "npm-run-all2": "^5.0.0", + "npm-run-all2": "^5.0.2", "open-cli": "^7.0.0", "prettier": "^2.3.2", "ts-node": "^10.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b827dc91..d7d80752 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,7 +32,7 @@ importers: specifier: ^12.5.0 version: 12.5.0 npm-run-all2: - specifier: ^5.0.0 + specifier: ^5.0.2 version: 5.0.2 open-cli: specifier: ^7.0.0 @@ -243,7 +243,7 @@ importers: specifier: ^5.6.3 version: 5.6.3(webpack@5.94.0) npm-run-all2: - specifier: ^5.0.0 + specifier: ^5.0.2 version: 5.0.2 prettier: specifier: ^2.2.1 @@ -623,7 +623,7 @@ importers: specifier: ^8.0.0 version: 8.56.0 npm-run-all2: - specifier: ^5.0.0 + specifier: ^5.0.2 version: 5.0.2 prettier: specifier: ^2.0.0 @@ -765,7 +765,7 @@ importers: specifier: ^8.0.0 version: 8.56.0 npm-run-all2: - specifier: ^5.0.0 + specifier: ^5.0.2 version: 5.0.2 prettier: specifier: ^2.0.0 @@ -13506,7 +13506,7 @@ packages: resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==} engines: {node: '>=14'} dependencies: - cross-spawn: 7.0.3 + cross-spawn: 7.0.6 signal-exit: 4.1.0 /forever-agent@0.6.1: @@ -17642,7 +17642,7 @@ packages: hasBin: true dependencies: ansi-styles: 5.2.0 - cross-spawn: 7.0.3 + cross-spawn: 7.0.6 memorystream: 0.3.1 minimatch: 3.1.2 pidtree: 0.5.0 From 076a082ef66a0d87ee6ea4b1250217158c5bb01b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 15:29:34 +0100 Subject: [PATCH 060/121] Update dependency node-fetch to ^2.7.0 (#186) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- packages/api/package.json | 2 +- pnpm-lock.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index 5e207c8f..b77ef3f5 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -88,7 +88,7 @@ "mime": "^2.6.0", "nestjs-console": "^8.0.0", "node-cache": "^5.1.2", - "node-fetch": "^2.6.1", + "node-fetch": "^2.7.0", "passport": "^0.6.0", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", diff --git a/packages/api/package.json b/packages/api/package.json index 7deed58d..58b74902 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -32,7 +32,7 @@ "@nestjs/cache-manager": "^2.3.0", "cache-manager": "^5.7.6", "commander": "^7.2.0", - "node-fetch": "^2.6.1" + "node-fetch": "^2.7.0" }, "devDependencies": { "@comet/blocks-api": "^7.7.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d7d80752..cee77b81 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -390,7 +390,7 @@ importers: specifier: ^5.1.2 version: 5.1.2 node-fetch: - specifier: ^2.6.1 + specifier: ^2.7.0 version: 2.7.0 passport: specifier: ^0.6.0 @@ -931,7 +931,7 @@ importers: specifier: ^7.2.0 version: 7.2.0 node-fetch: - specifier: ^2.6.1 + specifier: ^2.7.0 version: 2.7.0 devDependencies: '@comet/blocks-api': From d65fc260809408cd1e77bc1ae6550b8627ba6e12 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 15:29:56 +0100 Subject: [PATCH 061/121] Update dependency next to ^14.2.18 (#185) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/campaign/package.json | 2 +- demo/site/package.json | 2 +- pnpm-lock.yaml | 101 ++++++++++++++++++------------------- 3 files changed, 51 insertions(+), 54 deletions(-) diff --git a/demo/campaign/package.json b/demo/campaign/package.json index 1161d119..2afad466 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.15.3", - "next": "^14.2.0", + "next": "^14.2.18", "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 dd884b28..fcbf5794 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -37,7 +37,7 @@ "graphql": "^15.0.0", "graphql-request": "^3.7.0", "graphql-tag": "^2.12.6", - "next": "^14.2.0", + "next": "^14.2.18", "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 cee77b81..a0097ccb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -163,7 +163,7 @@ importers: version: 7.7.0(ts-node@10.9.2) '@comet/eslint-config': specifier: ^7.7.0 - version: 7.7.0(eslint@8.56.0)(next@14.2.16)(prettier@2.8.8)(typescript@4.9.5) + version: 7.7.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5) '@emotion/babel-plugin': specifier: ^11.0.0 version: 11.11.0 @@ -485,7 +485,7 @@ importers: dependencies: '@comet/cms-site': specifier: ^7.7.0 - version: 7.7.0(@types/react@18.3.12)(next@14.2.16)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) + version: 7.7.0(@types/react@18.3.12)(next@14.2.18)(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) @@ -532,8 +532,8 @@ importers: specifier: ^4.15.3 version: 4.15.3 next: - specifier: ^14.2.0 - 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) + specifier: ^14.2.18 + version: 14.2.18(@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 @@ -570,7 +570,7 @@ importers: version: 7.7.0(ts-node@10.9.2) '@comet/eslint-config': specifier: ^7.7.0 - version: 7.7.0(eslint@8.56.0)(next@14.2.16)(prettier@2.8.8)(typescript@4.9.5) + version: 7.7.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5) '@formatjs/cli': specifier: ^4.2.33 version: 4.8.4 @@ -642,7 +642,7 @@ importers: dependencies: '@comet/cms-site': specifier: ^7.7.0 - version: 7.7.0(@types/react@18.3.12)(next@14.2.16)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) + version: 7.7.0(@types/react@18.3.12)(next@14.2.18)(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 @@ -677,8 +677,8 @@ importers: specifier: ^2.12.6 version: 2.12.6(graphql@15.8.0) next: - specifier: ^14.2.0 - 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) + specifier: ^14.2.18 + version: 14.2.18(@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 @@ -712,7 +712,7 @@ importers: version: 7.7.0(ts-node@10.9.2) '@comet/eslint-config': specifier: ^7.7.0 - version: 7.7.0(eslint@8.56.0)(next@14.2.16)(prettier@2.8.8)(typescript@4.9.5) + version: 7.7.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5) '@formatjs/cli': specifier: ^4.2.33 version: 4.8.4 @@ -824,7 +824,7 @@ importers: version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0 - version: 7.7.0(eslint@8.56.0)(next@14.2.16)(prettier@2.8.8)(typescript@4.9.5) + version: 7.7.0(eslint@8.56.0)(next@14.2.18)(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) @@ -4129,7 +4129,7 @@ packages: - encoding - supports-color - /@comet/cms-site@7.7.0(@types/react@18.3.12)(next@14.2.16)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13): + /@comet/cms-site@7.7.0(@types/react@18.3.12)(next@14.2.18)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13): resolution: {integrity: sha512-wIdqXU/hLRiuNukO2ad9luhfdZHAcMk4hc/G3V8oqZI+cdEC3gYfw0dUzslb63YhNxqYRcF3/roaRWEZ+GC9Qw==} peerDependencies: '@types/react': ^18.0.0 @@ -4140,7 +4140,7 @@ packages: dependencies: '@types/react': 18.3.12 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) + next: 14.2.18(@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 @@ -4170,7 +4170,7 @@ packages: - debug dev: true - /@comet/eslint-config@7.7.0(eslint@8.56.0)(next@14.2.16)(prettier@2.8.8)(typescript@4.9.5): + /@comet/eslint-config@7.7.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5): resolution: {integrity: sha512-Ou7zHQdueJ8mQdwsGvQAYdMvzqnQ6guzZnWR69EFGbO2KN2WTm7EuLmaCvlDjZhfM89k6g1fX5MG12gFzDAIgg==} peerDependencies: eslint: '>= 8' @@ -4197,7 +4197,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.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) + next: 14.2.18(@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: @@ -6932,8 +6932,8 @@ packages: - utf-8-validate dev: false - /@next/env@14.2.16: - resolution: {integrity: sha512-fLrX5TfJzHCbnZ9YUSnGW63tMV3L4nSfhgOQ0iCcX21Pt+VSTDuaLsSuL8J/2XAiVA5AnzvXDpf6pMs60QxOag==} + /@next/env@14.2.18: + resolution: {integrity: sha512-2vWLOUwIPgoqMJKG6dt35fVXVhgM09tw4tK3/Q34GFXDrfiHlG7iS33VA4ggnjWxjiz9KV5xzfsQzJX6vGAekA==} /@next/eslint-plugin-next@14.2.16: resolution: {integrity: sha512-noORwKUMkKc96MWjTOwrsUCjky0oFegHbeJ1yEnQBGbMHAaTEIgLZIIfsYF0x3a06PiS+2TXppfifR+O6VWslg==} @@ -6941,72 +6941,72 @@ packages: glob: 10.3.10 dev: true - /@next/swc-darwin-arm64@14.2.16: - resolution: {integrity: sha512-uFT34QojYkf0+nn6MEZ4gIWQ5aqGF11uIZ1HSxG+cSbj+Mg3+tYm8qXYd3dKN5jqKUm5rBVvf1PBRO/MeQ6rxw==} + /@next/swc-darwin-arm64@14.2.18: + resolution: {integrity: sha512-tOBlDHCjGdyLf0ube/rDUs6VtwNOajaWV+5FV/ajPgrvHeisllEdymY/oDgv2cx561+gJksfMUtqf8crug7sbA==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /@next/swc-darwin-x64@14.2.16: - resolution: {integrity: sha512-mCecsFkYezem0QiZlg2bau3Xul77VxUD38b/auAjohMA22G9KTJneUYMv78vWoCCFkleFAhY1NIvbyjj1ncG9g==} + /@next/swc-darwin-x64@14.2.18: + resolution: {integrity: sha512-uJCEjutt5VeJ30jjrHV1VIHCsbMYnEqytQgvREx+DjURd/fmKy15NaVK4aR/u98S1LGTnjq35lRTnRyygglxoA==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /@next/swc-linux-arm64-gnu@14.2.16: - resolution: {integrity: sha512-yhkNA36+ECTC91KSyZcgWgKrYIyDnXZj8PqtJ+c2pMvj45xf7y/HrgI17hLdrcYamLfVt7pBaJUMxADtPaczHA==} + /@next/swc-linux-arm64-gnu@14.2.18: + resolution: {integrity: sha512-IL6rU8vnBB+BAm6YSWZewc+qvdL1EaA+VhLQ6tlUc0xp+kkdxQrVqAnh8Zek1ccKHlTDFRyAft0e60gteYmQ4A==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@next/swc-linux-arm64-musl@14.2.16: - resolution: {integrity: sha512-X2YSyu5RMys8R2lA0yLMCOCtqFOoLxrq2YbazFvcPOE4i/isubYjkh+JCpRmqYfEuCVltvlo+oGfj/b5T2pKUA==} + /@next/swc-linux-arm64-musl@14.2.18: + resolution: {integrity: sha512-RCaENbIZqKKqTlL8KNd+AZV/yAdCsovblOpYFp0OJ7ZxgLNbV5w23CUU1G5On+0fgafrsGcW+GdMKdFjaRwyYA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@next/swc-linux-x64-gnu@14.2.16: - resolution: {integrity: sha512-9AGcX7VAkGbc5zTSa+bjQ757tkjr6C/pKS7OK8cX7QEiK6MHIIezBLcQ7gQqbDW2k5yaqba2aDtaBeyyZh1i6Q==} + /@next/swc-linux-x64-gnu@14.2.18: + resolution: {integrity: sha512-3kmv8DlyhPRCEBM1Vavn8NjyXtMeQ49ID0Olr/Sut7pgzaQTo4h01S7Z8YNE0VtbowyuAL26ibcz0ka6xCTH5g==} engines: {node: '>= 10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@next/swc-linux-x64-musl@14.2.16: - resolution: {integrity: sha512-Klgeagrdun4WWDaOizdbtIIm8khUDQJ/5cRzdpXHfkbY91LxBXeejL4kbZBrpR/nmgRrQvmz4l3OtttNVkz2Sg==} + /@next/swc-linux-x64-musl@14.2.18: + resolution: {integrity: sha512-mliTfa8seVSpTbVEcKEXGjC18+TDII8ykW4a36au97spm9XMPqQTpdGPNBJ9RySSFw9/hLuaCMByluQIAnkzlw==} engines: {node: '>= 10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@next/swc-win32-arm64-msvc@14.2.16: - resolution: {integrity: sha512-PwW8A1UC1Y0xIm83G3yFGPiOBftJK4zukTmk7DI1CebyMOoaVpd8aSy7K6GhobzhkjYvqS/QmzcfsWG2Dwizdg==} + /@next/swc-win32-arm64-msvc@14.2.18: + resolution: {integrity: sha512-J5g0UFPbAjKYmqS3Cy7l2fetFmWMY9Oao32eUsBPYohts26BdrMUyfCJnZFQkX9npYaHNDOWqZ6uV9hSDPw9NA==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /@next/swc-win32-ia32-msvc@14.2.16: - resolution: {integrity: sha512-jhPl3nN0oKEshJBNDAo0etGMzv0j3q3VYorTSFqH1o3rwv1MQRdor27u1zhkgsHPNeY1jxcgyx1ZsCkDD1IHgg==} + /@next/swc-win32-ia32-msvc@14.2.18: + resolution: {integrity: sha512-Ynxuk4ZgIpdcN7d16ivJdjsDG1+3hTvK24Pp8DiDmIa2+A4CfhJSEHHVndCHok6rnLUzAZD+/UOKESQgTsAZGg==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /@next/swc-win32-x64-msvc@14.2.16: - resolution: {integrity: sha512-OA7NtfxgirCjfqt+02BqxC3MIgM/JaGjw9tOe4fyZgPsqfseNiMPnCRP44Pfs+Gpo9zPN+SXaFsgP6vk8d571A==} + /@next/swc-win32-x64-msvc@14.2.18: + resolution: {integrity: sha512-dtRGMhiU9TN5nyhwzce+7c/4CCeykYS+ipY/4mIrGzJ71+7zNo55ZxCB7cAVuNqdwtYniFNR2c9OFQ6UdFIMcg==} engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -10985,9 +10985,6 @@ packages: resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==} dev: false - /caniuse-lite@1.0.30001676: - resolution: {integrity: sha512-Qz6zwGCiPghQXGJvgQAem79esjitvJ+CxSbSQkW9H/UX5hg8XM88d4lp2W+MEQ81j+Hip58Il+jGVdazk1z9cw==} - /caniuse-lite@1.0.30001680: resolution: {integrity: sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==} @@ -17483,8 +17480,8 @@ packages: commander: 8.3.0 ora: 5.4.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): - resolution: {integrity: sha512-LcO7WnFu6lYSvCzZoo1dB+IO0xXz5uEv52HF1IUN0IqVTUIZGHuuR10I5efiLadGt+4oZqTcNZyVVEem/TM5nA==} + /next@14.2.18(@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-H9qbjDuGivUDEnK6wa+p2XKO+iMzgVgyr9Zp/4Iv29lKa+DYaxJGjOeEA+5VOvJh/M7HLiskehInSa0cWxVXUw==} engines: {node: '>=18.17.0'} hasBin: true peerDependencies: @@ -17502,27 +17499,27 @@ packages: sass: optional: true dependencies: - '@next/env': 14.2.16 + '@next/env': 14.2.18 '@opentelemetry/api': 1.7.0 '@swc/helpers': 0.5.5 '@types/react': 18.3.12 busboy: 1.6.0 - caniuse-lite: 1.0.30001676 + caniuse-lite: 1.0.30001680 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.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 + '@next/swc-darwin-arm64': 14.2.18 + '@next/swc-darwin-x64': 14.2.18 + '@next/swc-linux-arm64-gnu': 14.2.18 + '@next/swc-linux-arm64-musl': 14.2.18 + '@next/swc-linux-x64-gnu': 14.2.18 + '@next/swc-linux-x64-musl': 14.2.18 + '@next/swc-win32-arm64-msvc': 14.2.18 + '@next/swc-win32-ia32-msvc': 14.2.18 + '@next/swc-win32-x64-msvc': 14.2.18 transitivePeerDependencies: - '@babel/core' - babel-plugin-macros @@ -18399,7 +18396,7 @@ packages: dependencies: nanoid: 3.3.7 picocolors: 1.1.1 - source-map-js: 1.0.2 + source-map-js: 1.2.1 /postcss@8.4.33: resolution: {integrity: sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==} @@ -19859,11 +19856,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.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 cb7606e826e644fb7e88d2f5098059e6d092aa62 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:02:44 +0100 Subject: [PATCH 062/121] Update dependency open-cli to ^7.2.0 (#188) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index bd5e03b2..9829122a 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "husky": "^7.0.4", "lint-staged": "^12.5.0", "npm-run-all2": "^5.0.2", - "open-cli": "^7.0.0", + "open-cli": "^7.2.0", "prettier": "^2.3.2", "ts-node": "^10.5.0", "typescript": "^4.2.2" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a0097ccb..77389fce 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -35,7 +35,7 @@ importers: specifier: ^5.0.2 version: 5.0.2 open-cli: - specifier: ^7.0.0 + specifier: ^7.2.0 version: 7.2.0 prettier: specifier: ^2.3.2 From 617b9ba2e12a9e81040aabcd019c5e570ee09879 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:02:57 +0100 Subject: [PATCH 063/121] Update dependency @comet/dev-process-manager to ^2.7.0 (#184) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9829122a..40f9e711 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "publish": "pnpm run build:lib && $npm_execpath changeset publish" }, "devDependencies": { - "@comet/dev-process-manager": "^2.6.1", + "@comet/dev-process-manager": "^2.7.0", "@changesets/cli": "^2.27.10", "@formatjs/cli": "^4.8.3", "@types/node": "^18.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 77389fce..ca42edc4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,8 +14,8 @@ importers: specifier: ^2.27.10 version: 2.27.10 '@comet/dev-process-manager': - specifier: ^2.6.1 - version: 2.6.1 + specifier: ^2.7.0 + version: 2.7.0 '@formatjs/cli': specifier: ^4.8.3 version: 4.8.4 @@ -4151,8 +4151,8 @@ packages: usehooks-ts: 3.1.0(react@18.3.1) dev: false - /@comet/dev-process-manager@2.6.1: - resolution: {integrity: sha512-SdjHJolaBWhtqzbxn7FazVqdHsnS6YewAd6vpidSsumyxqVmESXb3/ZKUZh3huavxYKYEQSPCOToYwv+OnBrzQ==} + /@comet/dev-process-manager@2.7.0: + resolution: {integrity: sha512-BtCOF687GO1ccwm7ecHfIV57glnLSG+OsReEolomZJe3OeToMWjUpMyfJ+/5zm2m5EpzePA+kABhbIZk/Va90g==} engines: {node: '>=14'} hasBin: true dependencies: From 57b278a923c45fbb3a90d72ac9e9cc513cb8c060 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:03:18 +0100 Subject: [PATCH 064/121] Update dependency ts-loader to ^8.4.0 (#197) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- pnpm-lock.yaml | 52 ++++++++++--------------------------------- 2 files changed, 13 insertions(+), 41 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index b77ef3f5..f98f8170 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -116,7 +116,7 @@ "jest-junit": "^13.2.0", "prettier": "^2.1.2", "ts-jest": "^27.0.0", - "ts-loader": "^8.0.8", + "ts-loader": "^8.4.0", "ts-node": "^10.0.0", "tsconfig-paths": "^3.9.0", "typescript": "^4.0.5" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ca42edc4..eb527dce 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -469,7 +469,7 @@ importers: specifier: ^27.0.0 version: 27.1.5(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5) ts-loader: - specifier: ^8.0.8 + specifier: ^8.4.0 version: 8.4.0(typescript@4.9.5)(webpack@5.94.0) ts-node: specifier: ^10.0.0 @@ -5672,7 +5672,7 @@ packages: jest-util: 27.5.1 jest-validate: 27.5.1 jest-watcher: 27.5.1 - micromatch: 4.0.5 + micromatch: 4.0.8 rimraf: 3.0.2 slash: 3.0.0 strip-ansi: 6.0.1 @@ -5717,7 +5717,7 @@ packages: jest-util: 29.7.0 jest-validate: 29.7.0 jest-watcher: 29.7.0 - micromatch: 4.0.5 + micromatch: 4.0.8 pretty-format: 29.7.0 slash: 3.0.0 strip-ansi: 6.0.1 @@ -5989,7 +5989,7 @@ packages: jest-haste-map: 29.7.0 jest-regex-util: 29.6.3 jest-util: 29.7.0 - micromatch: 4.0.5 + micromatch: 4.0.8 pirates: 4.0.6 slash: 3.0.0 write-file-atomic: 4.0.2 @@ -10806,12 +10806,6 @@ packages: dependencies: balanced-match: 1.0.2 - /braces@3.0.2: - resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} - engines: {node: '>=8'} - dependencies: - fill-range: 7.0.1 - /braces@3.0.3: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} @@ -11115,7 +11109,7 @@ packages: engines: {node: '>= 8.10.0'} dependencies: anymatch: 3.1.3 - braces: 3.0.2 + braces: 3.0.3 glob-parent: 5.1.2 is-binary-path: 2.1.0 is-glob: 4.0.3 @@ -12377,14 +12371,6 @@ packages: tapable: 1.1.3 dev: true - /enhanced-resolve@5.15.0: - resolution: {integrity: sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==} - engines: {node: '>=10.13.0'} - dependencies: - graceful-fs: 4.2.11 - tapable: 2.2.1 - dev: true - /enhanced-resolve@5.17.1: resolution: {integrity: sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==} engines: {node: '>=10.13.0'} @@ -12619,7 +12605,7 @@ packages: eslint-plugin-import: '*' dependencies: debug: 4.3.7(supports-color@9.4.0) - enhanced-resolve: 5.15.0 + enhanced-resolve: 5.17.1 eslint: 8.56.0 eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.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) @@ -13222,7 +13208,7 @@ packages: '@nodelib/fs.walk': 1.2.8 glob-parent: 5.1.2 merge2: 1.4.1 - micromatch: 4.0.5 + micromatch: 4.0.8 /fast-json-stable-stringify@2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} @@ -13369,13 +13355,6 @@ packages: is-object: 1.0.2 merge-descriptors: 1.0.3 - /fill-range@7.0.1: - resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} - engines: {node: '>=8'} - requiresBuild: true - dependencies: - to-regex-range: 5.0.1 - /fill-range@7.1.1: resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} engines: {node: '>=8'} @@ -15266,7 +15245,7 @@ packages: jest-runner: 29.7.0 jest-util: 29.7.0 jest-validate: 29.7.0 - micromatch: 4.0.5 + micromatch: 4.0.8 parse-json: 5.2.0 pretty-format: 29.7.0 slash: 3.0.0 @@ -15418,7 +15397,7 @@ packages: jest-regex-util: 29.6.3 jest-util: 29.7.0 jest-worker: 29.7.0 - micromatch: 4.0.5 + micromatch: 4.0.8 walker: 1.0.8 optionalDependencies: fsevents: 2.3.3 @@ -15529,7 +15508,7 @@ packages: '@types/stack-utils': 2.0.3 chalk: 4.1.2 graceful-fs: 4.2.11 - micromatch: 4.0.5 + micromatch: 4.0.8 pretty-format: 29.7.0 slash: 3.0.0 stack-utils: 2.0.6 @@ -16831,13 +16810,6 @@ packages: resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==} engines: {node: '>= 0.6'} - /micromatch@4.0.5: - resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} - engines: {node: '>=8.6'} - dependencies: - braces: 3.0.2 - picomatch: 2.3.1 - /micromatch@4.0.8: resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} engines: {node: '>=8.6'} @@ -20662,7 +20634,7 @@ packages: chalk: 4.1.2 enhanced-resolve: 4.5.0 loader-utils: 2.0.4 - micromatch: 4.0.5 + micromatch: 4.0.8 semver: 7.5.4 typescript: 4.9.5 webpack: 5.94.0(webpack-cli@4.10.0) @@ -21066,7 +21038,7 @@ packages: /urlpattern-polyfill@6.0.2: resolution: {integrity: sha512-5vZjFlH9ofROmuWmXM9yj2wljYKgWstGwe8YTyiqM7hVum/g9LyCizPZtb3UqsuppVwety9QJmfc42VggLpTgg==} dependencies: - braces: 3.0.2 + braces: 3.0.3 dev: true /urlpattern-polyfill@8.0.2: From ec5d91dcedbc8213f3cc74aab9063e47a1689333 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:04:26 +0100 Subject: [PATCH 065/121] Update dependency styled-components to ^6.1.13 (#195) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- 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 2afad466..5410d361 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -42,7 +42,7 @@ "react-is": "^17.0.2", "redraft": "^0.10.0", "sitemap": "^6.0.0", - "styled-components": "^6.0.0", + "styled-components": "^6.1.13", "ts-node": "^10.0.0", "zod": "^3.22.4" }, diff --git a/demo/site/package.json b/demo/site/package.json index fcbf5794..16dc15ab 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -44,7 +44,7 @@ "react-is": "^17.0.2", "redraft": "^0.10.0", "sitemap": "^6.0.0", - "styled-components": "^6.0.0", + "styled-components": "^6.1.13", "ts-node": "^10.0.0" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eb527dce..3a90aed5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -553,7 +553,7 @@ importers: specifier: ^6.0.0 version: 6.4.0 styled-components: - specifier: ^6.0.0 + specifier: ^6.1.13 version: 6.1.13(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) ts-node: specifier: ^10.0.0 @@ -698,7 +698,7 @@ importers: specifier: ^6.0.0 version: 6.4.0 styled-components: - specifier: ^6.0.0 + specifier: ^6.1.13 version: 6.1.13(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) ts-node: specifier: ^10.0.0 From 4c677a52e3e31862f9b89386e4b2349a32ad66bb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:04:57 +0100 Subject: [PATCH 066/121] Update dependency style-loader to ^3.3.4 (#194) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index b1abccd7..f6ba29e5 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -92,7 +92,7 @@ "npm-run-all2": "^5.0.2", "prettier": "^2.2.1", "rimraf": "^3.0.0", - "style-loader": "^3.0.0", + "style-loader": "^3.3.4", "ts-node": "^10.0.0", "typescript": "^4.2.3", "webpack": "^5.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3a90aed5..4e90a4a1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -252,7 +252,7 @@ importers: specifier: ^3.0.0 version: 3.0.2 style-loader: - specifier: ^3.0.0 + specifier: ^3.3.4 version: 3.3.4(webpack@5.94.0) ts-node: specifier: ^10.0.0 From e235c34c409c719835d9999880310e38c7265fc8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:05:30 +0100 Subject: [PATCH 067/121] Update dependency slugify to ^1.6.6 (#193) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index f98f8170..8f61f026 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -93,7 +93,7 @@ "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.2.0", - "slugify": "^1.0.0", + "slugify": "^1.6.6", "uuid": "^8.3.2", "webpack": "^5.64.2" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4e90a4a1..12630863 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -405,7 +405,7 @@ importers: specifier: ^7.2.0 version: 7.8.1 slugify: - specifier: ^1.0.0 + specifier: ^1.6.6 version: 1.6.6 uuid: specifier: ^8.3.2 From 076043f05f1ef2209540f7724068baee416ae6e9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:06:30 +0100 Subject: [PATCH 068/121] Update dependency redraft to ^0.10.2 (#189) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- 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 5410d361..eaf0e005 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -40,7 +40,7 @@ "react-dom": "^18.0.0", "react-intl": "^5.0.0", "react-is": "^17.0.2", - "redraft": "^0.10.0", + "redraft": "^0.10.2", "sitemap": "^6.0.0", "styled-components": "^6.1.13", "ts-node": "^10.0.0", diff --git a/demo/site/package.json b/demo/site/package.json index 16dc15ab..d14fe8ec 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -42,7 +42,7 @@ "react-dom": "^18.0.0", "react-intl": "^5.0.0", "react-is": "^17.0.2", - "redraft": "^0.10.0", + "redraft": "^0.10.2", "sitemap": "^6.0.0", "styled-components": "^6.1.13", "ts-node": "^10.0.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 12630863..ad58449e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -547,7 +547,7 @@ importers: specifier: ^17.0.2 version: 17.0.2 redraft: - specifier: ^0.10.0 + specifier: ^0.10.2 version: 0.10.2 sitemap: specifier: ^6.0.0 @@ -692,7 +692,7 @@ importers: specifier: ^17.0.2 version: 17.0.2 redraft: - specifier: ^0.10.0 + specifier: ^0.10.2 version: 0.10.2 sitemap: specifier: ^6.0.0 From 9712e86ccb868d9aed5000bc1456c6ce90763ce1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 08:43:11 +0100 Subject: [PATCH 069/121] Update dependency rimraf to ^3.0.2 (#191) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- demo/campaign/package.json | 2 +- demo/site/package.json | 2 +- packages/api/package.json | 2 +- pnpm-lock.yaml | 11 +++++++---- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index f6ba29e5..cccf88b0 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -91,7 +91,7 @@ "html-webpack-plugin": "^5.6.3", "npm-run-all2": "^5.0.2", "prettier": "^2.2.1", - "rimraf": "^3.0.0", + "rimraf": "^3.0.2", "style-loader": "^3.3.4", "ts-node": "^10.0.0", "typescript": "^4.2.3", diff --git a/demo/campaign/package.json b/demo/campaign/package.json index eaf0e005..1799b612 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -69,7 +69,7 @@ "eslint": "^8.0.0", "npm-run-all2": "^5.0.2", "prettier": "^2.0.0", - "rimraf": "^3.0.0", + "rimraf": "^3.0.2", "tsconfig-paths": "^3.0.0", "typescript": "^4.0.0" }, diff --git a/demo/site/package.json b/demo/site/package.json index d14fe8ec..472875b4 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -70,7 +70,7 @@ "eslint": "^8.0.0", "npm-run-all2": "^5.0.2", "prettier": "^2.0.0", - "rimraf": "^3.0.0", + "rimraf": "^3.0.2", "tsconfig-paths": "^3.0.0", "typescript": "^4.0.0" } diff --git a/packages/api/package.json b/packages/api/package.json index 58b74902..70e7edf9 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -67,7 +67,7 @@ "nestjs-console": "^8.0.0", "prettier": "^2.0.0", "reflect-metadata": "^0.1.13", - "rimraf": "^3.0.0", + "rimraf": "^3.0.2", "rxjs": "^7.0.0", "ts-jest": "^29.0.5", "ts-node": "^10.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ad58449e..d6746844 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -249,7 +249,7 @@ importers: specifier: ^2.2.1 version: 2.8.8 rimraf: - specifier: ^3.0.0 + specifier: ^3.0.2 version: 3.0.2 style-loader: specifier: ^3.3.4 @@ -629,7 +629,7 @@ importers: specifier: ^2.0.0 version: 2.8.8 rimraf: - specifier: ^3.0.0 + specifier: ^3.0.2 version: 3.0.2 tsconfig-paths: specifier: ^3.0.0 @@ -771,7 +771,7 @@ importers: specifier: ^2.0.0 version: 2.8.8 rimraf: - specifier: ^3.0.0 + specifier: ^3.0.2 version: 3.0.2 tsconfig-paths: specifier: ^3.0.0 @@ -1031,7 +1031,7 @@ importers: specifier: ^0.1.13 version: 0.1.14 rimraf: - specifier: ^3.0.0 + specifier: ^3.0.2 version: 3.0.2 rxjs: specifier: ^7.0.0 @@ -13813,6 +13813,7 @@ packages: /glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} + deprecated: Glob versions prior to v9 are no longer supported dependencies: fs.realpath: 1.0.0 inflight: 1.0.6 @@ -14475,6 +14476,7 @@ packages: /inflight@1.0.6: resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==} + deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful. dependencies: once: 1.4.0 wrappy: 1.0.2 @@ -19376,6 +19378,7 @@ packages: /rimraf@3.0.2: resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} + deprecated: Rimraf versions prior to v4 are no longer supported hasBin: true dependencies: glob: 7.2.3 From 2d2ce0f70be998022141c753b11674d548926492 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 08:43:36 +0100 Subject: [PATCH 070/121] Update dependency sitemap to ^6.4.0 (#192) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/campaign/package.json | 2 +- demo/site/package.json | 2 +- pnpm-lock.yaml | 16 +++------------- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/demo/campaign/package.json b/demo/campaign/package.json index 1799b612..8a7c60ca 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -41,7 +41,7 @@ "react-intl": "^5.0.0", "react-is": "^17.0.2", "redraft": "^0.10.2", - "sitemap": "^6.0.0", + "sitemap": "^6.4.0", "styled-components": "^6.1.13", "ts-node": "^10.0.0", "zod": "^3.22.4" diff --git a/demo/site/package.json b/demo/site/package.json index 472875b4..5e67ce5e 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -43,7 +43,7 @@ "react-intl": "^5.0.0", "react-is": "^17.0.2", "redraft": "^0.10.2", - "sitemap": "^6.0.0", + "sitemap": "^6.4.0", "styled-components": "^6.1.13", "ts-node": "^10.0.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d6746844..05e67579 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -550,7 +550,7 @@ importers: specifier: ^0.10.2 version: 0.10.2 sitemap: - specifier: ^6.0.0 + specifier: ^6.4.0 version: 6.4.0 styled-components: specifier: ^6.1.13 @@ -695,7 +695,7 @@ importers: specifier: ^0.10.2 version: 0.10.2 sitemap: - specifier: ^6.0.0 + specifier: ^6.4.0 version: 6.4.0 styled-components: specifier: ^6.1.13 @@ -9127,12 +9127,6 @@ packages: dependencies: undici-types: 5.26.5 - /@types/node@22.9.0: - resolution: {integrity: sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==} - dependencies: - undici-types: 6.19.8 - dev: true - /@types/normalize-package-data@2.4.4: resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} dev: true @@ -15823,7 +15817,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.6.3 - '@types/node': 22.9.0 + '@types/node': 18.19.8 chalk: 4.1.2 ci-info: 3.9.0 graceful-fs: 4.2.11 @@ -20916,10 +20910,6 @@ packages: /undici-types@5.26.5: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} - /undici-types@6.19.8: - resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} - dev: true - /unicode-canonical-property-names-ecmascript@2.0.0: resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==} engines: {node: '>=4'} From 7b1478e5d5ff90ea711bba6bd4222aa47dbee6e9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 08:43:53 +0100 Subject: [PATCH 071/121] Update dependency ts-jest to ^27.1.5 (#196) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index 8f61f026..a493eac7 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -115,7 +115,7 @@ "jest": "^27.0.0", "jest-junit": "^13.2.0", "prettier": "^2.1.2", - "ts-jest": "^27.0.0", + "ts-jest": "^27.1.5", "ts-loader": "^8.4.0", "ts-node": "^10.0.0", "tsconfig-paths": "^3.9.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 05e67579..5bca8000 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -466,7 +466,7 @@ importers: specifier: ^2.1.2 version: 2.8.8 ts-jest: - specifier: ^27.0.0 + specifier: ^27.1.5 version: 27.1.5(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5) ts-loader: specifier: ^8.4.0 From 933f8cc00ff2e6ea78e474f61fc07ae8057c1923 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 08:44:13 +0100 Subject: [PATCH 072/121] Update dependency ts-node to ^10.9.2 (#198) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- demo/api/package.json | 2 +- demo/campaign/package.json | 2 +- demo/site/package.json | 2 +- package.json | 2 +- packages/api/package.json | 2 +- pnpm-lock.yaml | 24 ++++++++++-------------- 7 files changed, 16 insertions(+), 20 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index cccf88b0..7d16722b 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -93,7 +93,7 @@ "prettier": "^2.2.1", "rimraf": "^3.0.2", "style-loader": "^3.3.4", - "ts-node": "^10.0.0", + "ts-node": "^10.9.2", "typescript": "^4.2.3", "webpack": "^5.0.0", "webpack-cli": "^4.0.0", diff --git a/demo/api/package.json b/demo/api/package.json index a493eac7..a9f9de62 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -117,7 +117,7 @@ "prettier": "^2.1.2", "ts-jest": "^27.1.5", "ts-loader": "^8.4.0", - "ts-node": "^10.0.0", + "ts-node": "^10.9.2", "tsconfig-paths": "^3.9.0", "typescript": "^4.0.5" }, diff --git a/demo/campaign/package.json b/demo/campaign/package.json index 8a7c60ca..42d509e1 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -43,7 +43,7 @@ "redraft": "^0.10.2", "sitemap": "^6.4.0", "styled-components": "^6.1.13", - "ts-node": "^10.0.0", + "ts-node": "^10.9.2", "zod": "^3.22.4" }, "devDependencies": { diff --git a/demo/site/package.json b/demo/site/package.json index 5e67ce5e..761ba73e 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -45,7 +45,7 @@ "redraft": "^0.10.2", "sitemap": "^6.4.0", "styled-components": "^6.1.13", - "ts-node": "^10.0.0" + "ts-node": "^10.9.2" }, "devDependencies": { "@babel/core": "^7.16.0", diff --git a/package.json b/package.json index 40f9e711..f7e01ff2 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "npm-run-all2": "^5.0.2", "open-cli": "^7.2.0", "prettier": "^2.3.2", - "ts-node": "^10.5.0", + "ts-node": "^10.9.2", "typescript": "^4.2.2" }, "pnpm": { diff --git a/packages/api/package.json b/packages/api/package.json index 70e7edf9..62d3ad3a 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -70,7 +70,7 @@ "rimraf": "^3.0.2", "rxjs": "^7.0.0", "ts-jest": "^29.0.5", - "ts-node": "^10.0.0", + "ts-node": "^10.9.2", "typescript": "^4.0.0", "uuid": "^8.3.2" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5bca8000..c3b03bf1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -41,7 +41,7 @@ importers: specifier: ^2.3.2 version: 2.8.8 ts-node: - specifier: ^10.5.0 + specifier: ^10.9.2 version: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) typescript: specifier: ^4.2.2 @@ -255,7 +255,7 @@ importers: specifier: ^3.3.4 version: 3.3.4(webpack@5.94.0) ts-node: - specifier: ^10.0.0 + specifier: ^10.9.2 version: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) typescript: specifier: ^4.2.3 @@ -472,7 +472,7 @@ importers: specifier: ^8.4.0 version: 8.4.0(typescript@4.9.5)(webpack@5.94.0) ts-node: - specifier: ^10.0.0 + specifier: ^10.9.2 version: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) tsconfig-paths: specifier: ^3.9.0 @@ -556,7 +556,7 @@ importers: specifier: ^6.1.13 version: 6.1.13(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) ts-node: - specifier: ^10.0.0 + specifier: ^10.9.2 version: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) zod: specifier: ^3.22.4 @@ -701,7 +701,7 @@ importers: specifier: ^6.1.13 version: 6.1.13(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) ts-node: - specifier: ^10.0.0 + specifier: ^10.9.2 version: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) devDependencies: '@babel/core': @@ -1040,7 +1040,7 @@ importers: specifier: ^29.0.5 version: 29.1.1(jest@29.7.0)(typescript@4.9.5) ts-node: - specifier: ^10.0.0 + specifier: ^10.9.2 version: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) typescript: specifier: ^4.0.0 @@ -2130,7 +2130,7 @@ packages: dependencies: '@babel/types': 7.23.6 '@jridgewell/gen-mapping': 0.3.3 - '@jridgewell/trace-mapping': 0.3.21 + '@jridgewell/trace-mapping': 0.3.25 jsesc: 2.5.2 /@babel/helper-annotate-as-pure@7.22.5: @@ -6030,7 +6030,7 @@ packages: dependencies: '@jridgewell/set-array': 1.2.1 '@jridgewell/sourcemap-codec': 1.5.0 - '@jridgewell/trace-mapping': 0.3.21 + '@jridgewell/trace-mapping': 0.3.25 /@jridgewell/gen-mapping@0.3.5: resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} @@ -6062,6 +6062,7 @@ packages: dependencies: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.0 + dev: true /@jridgewell/trace-mapping@0.3.25: resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} @@ -9879,11 +9880,6 @@ packages: hasBin: true dev: true - /acorn@8.11.3: - resolution: {integrity: sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==} - engines: {node: '>=0.4.0'} - hasBin: true - /acorn@8.14.0: resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==} engines: {node: '>=0.4.0'} @@ -20667,7 +20663,7 @@ packages: '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 '@types/node': 18.19.8 - acorn: 8.11.3 + acorn: 8.14.0 acorn-walk: 8.3.2 arg: 4.1.3 create-require: 1.1.1 From 5a6c01f73aaacbb2debecf43cb0234786a10b0f5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 08:58:36 +0100 Subject: [PATCH 073/121] Update dependency tsconfig-paths to ^3.15.0 (#199) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- demo/campaign/package.json | 2 +- demo/site/package.json | 2 +- pnpm-lock.yaml | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index a9f9de62..2b98562c 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -118,7 +118,7 @@ "ts-jest": "^27.1.5", "ts-loader": "^8.4.0", "ts-node": "^10.9.2", - "tsconfig-paths": "^3.9.0", + "tsconfig-paths": "^3.15.0", "typescript": "^4.0.5" }, "mikro-orm": { diff --git a/demo/campaign/package.json b/demo/campaign/package.json index 42d509e1..e13334e1 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -70,7 +70,7 @@ "npm-run-all2": "^5.0.2", "prettier": "^2.0.0", "rimraf": "^3.0.2", - "tsconfig-paths": "^3.0.0", + "tsconfig-paths": "^3.15.0", "typescript": "^4.0.0" }, "peerDependencies": { diff --git a/demo/site/package.json b/demo/site/package.json index 761ba73e..e5b3aadc 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -71,7 +71,7 @@ "npm-run-all2": "^5.0.2", "prettier": "^2.0.0", "rimraf": "^3.0.2", - "tsconfig-paths": "^3.0.0", + "tsconfig-paths": "^3.15.0", "typescript": "^4.0.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c3b03bf1..76ed0859 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -475,7 +475,7 @@ importers: specifier: ^10.9.2 version: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) tsconfig-paths: - specifier: ^3.9.0 + specifier: ^3.15.0 version: 3.15.0 typescript: specifier: ^4.0.5 @@ -632,7 +632,7 @@ importers: specifier: ^3.0.2 version: 3.0.2 tsconfig-paths: - specifier: ^3.0.0 + specifier: ^3.15.0 version: 3.15.0 typescript: specifier: ^4.0.0 @@ -774,7 +774,7 @@ importers: specifier: ^3.0.2 version: 3.0.2 tsconfig-paths: - specifier: ^3.0.0 + specifier: ^3.15.0 version: 3.15.0 typescript: specifier: ^4.0.0 From 3e8083285c9c573e7b38425fa55b1c1d08130b6d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 10:05:16 +0100 Subject: [PATCH 074/121] Update dependency typescript to ^4.9.5 (#200) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- demo/api/package.json | 2 +- demo/campaign/package.json | 2 +- demo/site/package.json | 2 +- package.json | 2 +- packages/admin/package.json | 2 +- packages/api/package.json | 2 +- pnpm-lock.yaml | 14 +++++++------- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 7d16722b..b6d36239 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -94,7 +94,7 @@ "rimraf": "^3.0.2", "style-loader": "^3.3.4", "ts-node": "^10.9.2", - "typescript": "^4.2.3", + "typescript": "^4.9.5", "webpack": "^5.0.0", "webpack-cli": "^4.0.0", "webpack-dev-server": "^4.0.0" diff --git a/demo/api/package.json b/demo/api/package.json index 2b98562c..bcc37ed4 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -119,7 +119,7 @@ "ts-loader": "^8.4.0", "ts-node": "^10.9.2", "tsconfig-paths": "^3.15.0", - "typescript": "^4.0.5" + "typescript": "^4.9.5" }, "mikro-orm": { "useTsNode": true, diff --git a/demo/campaign/package.json b/demo/campaign/package.json index e13334e1..63740b83 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -71,7 +71,7 @@ "prettier": "^2.0.0", "rimraf": "^3.0.2", "tsconfig-paths": "^3.15.0", - "typescript": "^4.0.0" + "typescript": "^4.9.5" }, "peerDependencies": { "mjml": "^4.7.0" diff --git a/demo/site/package.json b/demo/site/package.json index e5b3aadc..831c4c9f 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -72,6 +72,6 @@ "prettier": "^2.0.0", "rimraf": "^3.0.2", "tsconfig-paths": "^3.15.0", - "typescript": "^4.0.0" + "typescript": "^4.9.5" } } diff --git a/package.json b/package.json index f7e01ff2..15e28e05 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "open-cli": "^7.2.0", "prettier": "^2.3.2", "ts-node": "^10.9.2", - "typescript": "^4.2.2" + "typescript": "^4.9.5" }, "pnpm": { "packageExtensions": { diff --git a/packages/admin/package.json b/packages/admin/package.json index 317c115e..7e047b24 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -71,7 +71,7 @@ "react-router": "^5.1.2", "react-router-dom": "^5.1.2", "rimraf": "^3.0.2", - "typescript": "^4.0.0" + "typescript": "^4.9.5" }, "peerDependencies": { "@apollo/client": "^3.2.5", diff --git a/packages/api/package.json b/packages/api/package.json index 62d3ad3a..aab574e0 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -71,7 +71,7 @@ "rxjs": "^7.0.0", "ts-jest": "^29.0.5", "ts-node": "^10.9.2", - "typescript": "^4.0.0", + "typescript": "^4.9.5", "uuid": "^8.3.2" }, "peerDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 76ed0859..f32f335e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -44,7 +44,7 @@ importers: specifier: ^10.9.2 version: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) typescript: - specifier: ^4.2.2 + specifier: ^4.9.5 version: 4.9.5 demo/admin: @@ -258,7 +258,7 @@ importers: specifier: ^10.9.2 version: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) typescript: - specifier: ^4.2.3 + specifier: ^4.9.5 version: 4.9.5 webpack: specifier: ^5.0.0 @@ -478,7 +478,7 @@ importers: specifier: ^3.15.0 version: 3.15.0 typescript: - specifier: ^4.0.5 + specifier: ^4.9.5 version: 4.9.5 demo/campaign: @@ -635,7 +635,7 @@ importers: specifier: ^3.15.0 version: 3.15.0 typescript: - specifier: ^4.0.0 + specifier: ^4.9.5 version: 4.9.5 demo/site: @@ -777,7 +777,7 @@ importers: specifier: ^3.15.0 version: 3.15.0 typescript: - specifier: ^4.0.0 + specifier: ^4.9.5 version: 4.9.5 packages/admin: @@ -907,7 +907,7 @@ importers: specifier: ^3.0.2 version: 3.0.2 typescript: - specifier: ^4.0.0 + specifier: ^4.9.5 version: 4.9.5 packages/api: @@ -1043,7 +1043,7 @@ importers: specifier: ^10.9.2 version: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) typescript: - specifier: ^4.0.0 + specifier: ^4.9.5 version: 4.9.5 uuid: specifier: ^8.3.2 From 7345b58e622f3b76cc6f5a6563c859dce73f6091 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 10:22:24 +0100 Subject: [PATCH 075/121] Update dependency webpack-cli to ^4.10.0 (#201) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- pnpm-lock.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index b6d36239..d018e156 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -96,7 +96,7 @@ "ts-node": "^10.9.2", "typescript": "^4.9.5", "webpack": "^5.0.0", - "webpack-cli": "^4.0.0", + "webpack-cli": "^4.10.0", "webpack-dev-server": "^4.0.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f32f335e..fa685192 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -264,7 +264,7 @@ importers: specifier: ^5.0.0 version: 5.94.0(webpack-cli@4.10.0) webpack-cli: - specifier: ^4.0.0 + specifier: ^4.10.0 version: 4.10.0(webpack-dev-server@4.15.1)(webpack@5.94.0) webpack-dev-server: specifier: ^4.0.0 @@ -21321,7 +21321,7 @@ packages: '@webpack-cli/serve': 1.7.0(webpack-cli@4.10.0)(webpack-dev-server@4.15.1) colorette: 2.0.20 commander: 7.2.0 - cross-spawn: 7.0.3 + cross-spawn: 7.0.6 fastest-levenshtein: 1.0.16 import-local: 3.1.0 interpret: 2.2.0 From d6bcff9b77af4ee5809f6d6a60573658472e2da7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 10:41:40 +0100 Subject: [PATCH 076/121] Update dependency webpack-dev-server to ^4.15.2 (#202) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- pnpm-lock.yaml | 72 +++++++++++++++-------------------------- 2 files changed, 27 insertions(+), 47 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index d018e156..14ce35ea 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -97,6 +97,6 @@ "typescript": "^4.9.5", "webpack": "^5.0.0", "webpack-cli": "^4.10.0", - "webpack-dev-server": "^4.0.0" + "webpack-dev-server": "^4.15.2" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fa685192..4e344a0a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -265,10 +265,10 @@ importers: version: 5.94.0(webpack-cli@4.10.0) webpack-cli: specifier: ^4.10.0 - version: 4.10.0(webpack-dev-server@4.15.1)(webpack@5.94.0) + version: 4.10.0(webpack-dev-server@4.15.2)(webpack@5.94.0) webpack-dev-server: - specifier: ^4.0.0 - version: 4.15.1(webpack-cli@4.10.0)(webpack@5.94.0) + specifier: ^4.15.2 + version: 4.15.2(webpack-cli@4.10.0)(webpack@5.94.0) demo/api: dependencies: @@ -8839,7 +8839,7 @@ packages: resolution: {integrity: sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==} dependencies: '@types/body-parser': 1.19.2 - '@types/express-serve-static-core': 4.17.31 + '@types/express-serve-static-core': 4.17.41 '@types/qs': 6.9.11 '@types/serve-static': 1.15.5 dev: false @@ -9700,7 +9700,7 @@ packages: webpack-cli: 4.x.x dependencies: webpack: 5.94.0(webpack-cli@4.10.0) - webpack-cli: 4.10.0(webpack-dev-server@4.15.1)(webpack@5.94.0) + webpack-cli: 4.10.0(webpack-dev-server@4.15.2)(webpack@5.94.0) /@webpack-cli/info@1.5.0(webpack-cli@4.10.0): resolution: {integrity: sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==} @@ -9708,9 +9708,9 @@ packages: webpack-cli: 4.x.x dependencies: envinfo: 7.11.0 - webpack-cli: 4.10.0(webpack-dev-server@4.15.1)(webpack@5.94.0) + webpack-cli: 4.10.0(webpack-dev-server@4.15.2)(webpack@5.94.0) - /@webpack-cli/serve@1.7.0(webpack-cli@4.10.0)(webpack-dev-server@4.15.1): + /@webpack-cli/serve@1.7.0(webpack-cli@4.10.0)(webpack-dev-server@4.15.2): resolution: {integrity: sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==} peerDependencies: webpack-cli: 4.x.x @@ -9719,8 +9719,8 @@ packages: webpack-dev-server: optional: true dependencies: - webpack-cli: 4.10.0(webpack-dev-server@4.15.1)(webpack@5.94.0) - webpack-dev-server: 4.15.1(webpack-cli@4.10.0)(webpack@5.94.0) + webpack-cli: 4.10.0(webpack-dev-server@4.15.2)(webpack@5.94.0) + webpack-dev-server: 4.15.2(webpack-cli@4.10.0)(webpack@5.94.0) /@whatwg-node/events@0.0.2: resolution: {integrity: sha512-WKj/lI4QjnLuPrim0cfO7i+HsDSXHxNv1y0CrJhdntuO3hxWZmnXCwNDnwOvry11OjRin6cgWNF+j/9Pn8TN4w==} @@ -10651,7 +10651,7 @@ packages: dependencies: tweetnacl: 0.14.5 - /better-ajv-errors@1.2.0(ajv@8.12.0): + /better-ajv-errors@1.2.0(ajv@8.17.1): resolution: {integrity: sha512-UW+IsFycygIo7bclP9h5ugkNH8EjCSgqyFB/yQ4Hqqa1OEYDtb0uFIkYE0b6+CjkgJYVM5UKI/pJPxjYe9EZlA==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -10659,7 +10659,7 @@ packages: dependencies: '@babel/code-frame': 7.23.5 '@humanwhocodes/momoa': 2.0.4 - ajv: 8.12.0 + ajv: 8.17.1 chalk: 4.1.2 jsonpointer: 5.0.1 leven: 3.1.0 @@ -10880,10 +10880,6 @@ packages: resolution: {integrity: sha512-s6webAy+R4SR8XVuJWt2V2rGvhnrhxN+9S15GNuTK3wKPOXFF6RNc+8ug2XhH+2s4f+uudG4kUVYmYOQWL2g0Q==} engines: {node: '>=0.10.0'} - /bytes@3.0.0: - resolution: {integrity: sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==} - engines: {node: '>= 0.8'} - /bytes@3.1.2: resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} engines: {node: '>= 0.8'} @@ -11435,20 +11431,6 @@ packages: dependencies: mime-db: 1.53.0 - /compression@1.7.4: - resolution: {integrity: sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==} - engines: {node: '>= 0.8.0'} - dependencies: - accepts: 1.3.8 - bytes: 3.0.0 - compressible: 2.0.18 - debug: 2.6.9 - on-headers: 1.0.2 - safe-buffer: 5.1.2 - vary: 1.1.2 - transitivePeerDependencies: - - supports-color - /compression@1.7.5: resolution: {integrity: sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==} engines: {node: '>= 0.8.0'} @@ -11462,7 +11444,6 @@ packages: vary: 1.1.2 transitivePeerDependencies: - supports-color - dev: false /compute-scroll-into-view@1.0.20: resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==} @@ -12725,8 +12706,8 @@ packages: peerDependencies: eslint: '>=5' dependencies: - ajv: 8.12.0 - better-ajv-errors: 1.2.0(ajv@8.12.0) + ajv: 8.17.1 + better-ajv-errors: 1.2.0(ajv@8.17.1) eslint: 8.56.0 requireindex: 1.2.0 semver: 7.5.4 @@ -17428,7 +17409,6 @@ packages: /negotiator@0.6.4: resolution: {integrity: sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==} engines: {node: '>= 0.6'} - dev: false /neo-async@2.6.2: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} @@ -21295,7 +21275,7 @@ packages: - utf-8-validate dev: false - /webpack-cli@4.10.0(webpack-dev-server@4.15.1)(webpack@5.94.0): + /webpack-cli@4.10.0(webpack-dev-server@4.15.2)(webpack@5.94.0): resolution: {integrity: sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==} engines: {node: '>=10.13.0'} hasBin: true @@ -21318,7 +21298,7 @@ packages: '@discoveryjs/json-ext': 0.5.7 '@webpack-cli/configtest': 1.2.0(webpack-cli@4.10.0)(webpack@5.94.0) '@webpack-cli/info': 1.5.0(webpack-cli@4.10.0) - '@webpack-cli/serve': 1.7.0(webpack-cli@4.10.0)(webpack-dev-server@4.15.1) + '@webpack-cli/serve': 1.7.0(webpack-cli@4.10.0)(webpack-dev-server@4.15.2) colorette: 2.0.20 commander: 7.2.0 cross-spawn: 7.0.6 @@ -21327,11 +21307,11 @@ packages: interpret: 2.2.0 rechoir: 0.7.1 webpack: 5.94.0(webpack-cli@4.10.0) - webpack-dev-server: 4.15.1(webpack-cli@4.10.0)(webpack@5.94.0) + webpack-dev-server: 4.15.2(webpack-cli@4.10.0)(webpack@5.94.0) webpack-merge: 5.10.0 - /webpack-dev-middleware@5.3.3(webpack@5.94.0): - resolution: {integrity: sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==} + /webpack-dev-middleware@5.3.4(webpack@5.94.0): + resolution: {integrity: sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==} engines: {node: '>= 12.13.0'} peerDependencies: webpack: ^4.0.0 || ^5.0.0 @@ -21343,8 +21323,8 @@ packages: schema-utils: 4.2.0 webpack: 5.94.0(webpack-cli@4.10.0) - /webpack-dev-server@4.15.1(webpack-cli@4.10.0)(webpack@5.94.0): - resolution: {integrity: sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==} + /webpack-dev-server@4.15.2(webpack-cli@4.10.0)(webpack@5.94.0): + resolution: {integrity: sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==} engines: {node: '>= 12.13.0'} hasBin: true peerDependencies: @@ -21365,12 +21345,12 @@ packages: '@types/ws': 8.5.10 ansi-html-community: 0.0.8 bonjour-service: 1.2.1 - chokidar: 3.5.3 + chokidar: 3.6.0 colorette: 2.0.20 - compression: 1.7.4 + compression: 1.7.5 connect-history-api-fallback: 2.0.0 default-gateway: 6.0.3 - express: 4.18.2 + express: 4.20.0 graceful-fs: 4.2.11 html-entities: 2.4.0 http-proxy-middleware: 2.0.6(@types/express@4.17.21) @@ -21385,8 +21365,8 @@ packages: sockjs: 0.3.24 spdy: 4.0.2 webpack: 5.94.0(webpack-cli@4.10.0) - webpack-cli: 4.10.0(webpack-dev-server@4.15.1)(webpack@5.94.0) - webpack-dev-middleware: 5.3.3(webpack@5.94.0) + webpack-cli: 4.10.0(webpack-dev-server@4.15.2)(webpack@5.94.0) + webpack-dev-middleware: 5.3.4(webpack@5.94.0) ws: 8.16.0 transitivePeerDependencies: - bufferutil @@ -21483,7 +21463,7 @@ packages: tapable: 2.2.1 terser-webpack-plugin: 5.3.10(webpack@5.94.0) watchpack: 2.4.2 - webpack-cli: 4.10.0(webpack-dev-server@4.15.1)(webpack@5.94.0) + webpack-cli: 4.10.0(webpack-dev-server@4.15.2)(webpack@5.94.0) webpack-sources: 3.2.3 transitivePeerDependencies: - '@swc/core' From 7da30d61c7219f11107c5a5c6fca4807ad8c27c5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 10:43:33 +0100 Subject: [PATCH 077/121] Update dependency zod to ^3.23.8 (#203) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/campaign/package.json | 2 +- pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/campaign/package.json b/demo/campaign/package.json index 63740b83..eb45d134 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -44,7 +44,7 @@ "sitemap": "^6.4.0", "styled-components": "^6.1.13", "ts-node": "^10.9.2", - "zod": "^3.22.4" + "zod": "^3.23.8" }, "devDependencies": { "@babel/core": "^7.16.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4e344a0a..67e7fcc2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -559,7 +559,7 @@ importers: specifier: ^10.9.2 version: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) zod: - specifier: ^3.22.4 + specifier: ^3.23.8 version: 3.23.8 devDependencies: '@babel/core': From 31ac95f339d0fd4552c83717fc9fa7939fa9172e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 10:44:13 +0100 Subject: [PATCH 078/121] Update formatjs monorepo (#204) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 4 ++-- demo/campaign/package.json | 4 ++-- demo/site/package.json | 4 ++-- package.json | 2 +- packages/admin/package.json | 2 +- pnpm-lock.yaml | 38 ++++++++++++++++--------------------- 6 files changed, 24 insertions(+), 30 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 14ce35ea..7974f23b 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -56,7 +56,7 @@ "react-dnd-html5-backend": "^16.0.0", "react-dom": "^17.0.0", "react-final-form": "^6.3.1", - "react-intl": "^5.10.0", + "react-intl": "^5.25.1", "react-router": "^5.1.2", "react-router-dom": "^5.1.2" }, @@ -64,7 +64,7 @@ "@comet/cli": "^7.7.0", "@comet/eslint-config": "^7.7.0", "@emotion/babel-plugin": "^11.0.0", - "@formatjs/cli": "^3.0.1", + "@formatjs/cli": "^3.2.0", "@gitbeaker/node": "^35.8.1", "@graphql-codegen/add": "^3.2.3", "@graphql-codegen/cli": "^2.16.5", diff --git a/demo/campaign/package.json b/demo/campaign/package.json index eb45d134..6326f251 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -38,7 +38,7 @@ "next": "^14.2.18", "react": "^18.0.0", "react-dom": "^18.0.0", - "react-intl": "^5.0.0", + "react-intl": "^5.25.1", "react-is": "^17.0.2", "redraft": "^0.10.2", "sitemap": "^6.4.0", @@ -50,7 +50,7 @@ "@babel/core": "^7.16.0", "@comet/cli": "^7.7.0", "@comet/eslint-config": "^7.7.0", - "@formatjs/cli": "^4.2.33", + "@formatjs/cli": "^4.8.4", "@gitbeaker/node": "^35.8.1", "@graphql-codegen/add": "^3.2.3", "@graphql-codegen/cli": "^2.16.5", diff --git a/demo/site/package.json b/demo/site/package.json index 831c4c9f..a0f1d889 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -40,7 +40,7 @@ "next": "^14.2.18", "react": "^18.0.0", "react-dom": "^18.0.0", - "react-intl": "^5.0.0", + "react-intl": "^5.25.1", "react-is": "^17.0.2", "redraft": "^0.10.2", "sitemap": "^6.4.0", @@ -51,7 +51,7 @@ "@babel/core": "^7.16.0", "@comet/cli": "^7.7.0", "@comet/eslint-config": "^7.7.0", - "@formatjs/cli": "^4.2.33", + "@formatjs/cli": "^4.8.4", "@gitbeaker/node": "^35.8.1", "@graphql-codegen/add": "^3.2.3", "@graphql-codegen/cli": "^2.16.5", diff --git a/package.json b/package.json index 15e28e05..c7a0d688 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "devDependencies": { "@comet/dev-process-manager": "^2.7.0", "@changesets/cli": "^2.27.10", - "@formatjs/cli": "^4.8.3", + "@formatjs/cli": "^4.8.4", "@types/node": "^18.0.0", "dotenv-cli": "^6.0.0", "husky": "^7.0.4", diff --git a/packages/admin/package.json b/packages/admin/package.json index 7e047b24..b23250cd 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -67,7 +67,7 @@ "react-dnd-html5-backend": "^16.0.0", "react-dom": "^17.0", "react-final-form": "^6.3.1", - "react-intl": "^5.24.6", + "react-intl": "^5.25.1", "react-router": "^5.1.2", "react-router-dom": "^5.1.2", "rimraf": "^3.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 67e7fcc2..90b5fca6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,7 +17,7 @@ importers: specifier: ^2.7.0 version: 2.7.0 '@formatjs/cli': - specifier: ^4.8.3 + specifier: ^4.8.4 version: 4.8.4 '@types/node': specifier: ^18.0.0 @@ -149,7 +149,7 @@ importers: specifier: ^6.3.1 version: 6.5.9(final-form@4.20.10)(react@17.0.2) react-intl: - specifier: ^5.10.0 + specifier: ^5.25.1 version: 5.25.1(@types/react@17.0.75)(react@17.0.2)(typescript@4.9.5) react-router: specifier: ^5.1.2 @@ -168,7 +168,7 @@ importers: specifier: ^11.0.0 version: 11.11.0 '@formatjs/cli': - specifier: ^3.0.1 + specifier: ^3.2.0 version: 3.2.0 '@gitbeaker/node': specifier: ^35.8.1 @@ -541,7 +541,7 @@ importers: specifier: ^18.0.0 version: 18.3.1(react@18.3.1) react-intl: - specifier: ^5.0.0 + specifier: ^5.25.1 version: 5.25.1(@types/react@18.3.12)(react@18.3.1)(typescript@4.9.5) react-is: specifier: ^17.0.2 @@ -572,7 +572,7 @@ importers: specifier: ^7.7.0 version: 7.7.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5) '@formatjs/cli': - specifier: ^4.2.33 + specifier: ^4.8.4 version: 4.8.4 '@gitbeaker/node': specifier: ^35.8.1 @@ -686,7 +686,7 @@ importers: specifier: ^18.0.0 version: 18.3.1(react@18.3.1) react-intl: - specifier: ^5.0.0 + specifier: ^5.25.1 version: 5.25.1(@types/react@18.3.12)(react@18.3.1)(typescript@4.9.5) react-is: specifier: ^17.0.2 @@ -714,7 +714,7 @@ importers: specifier: ^7.7.0 version: 7.7.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5) '@formatjs/cli': - specifier: ^4.2.33 + specifier: ^4.8.4 version: 4.8.4 '@gitbeaker/node': specifier: ^35.8.1 @@ -895,7 +895,7 @@ importers: specifier: ^6.3.1 version: 6.5.9(final-form@4.20.10)(react@17.0.2) react-intl: - specifier: ^5.24.6 + specifier: ^5.25.1 version: 5.25.1(@types/react@17.0.75)(react@17.0.2)(typescript@4.9.5) react-router: specifier: ^5.1.2 @@ -4541,7 +4541,7 @@ packages: json-stable-stringify: 1.1.1 lodash: 4.17.21 loud-rejection: 2.2.0 - tslib: 2.6.2 + tslib: 2.8.1 typescript: 4.9.5 transitivePeerDependencies: - ts-jest @@ -4564,7 +4564,7 @@ packages: fs-extra: 10.1.0 json-stable-stringify: 1.1.1 loud-rejection: 2.2.0 - tslib: 2.6.2 + tslib: 2.8.1 typescript: 4.9.5 vue: 3.4.14(typescript@4.9.5) transitivePeerDependencies: @@ -9536,7 +9536,7 @@ packages: '@vue/shared': 3.4.14 entities: 4.5.0 estree-walker: 2.0.2 - source-map-js: 1.0.2 + source-map-js: 1.2.1 dev: true /@vue/compiler-dom@3.4.14: @@ -9556,8 +9556,8 @@ packages: '@vue/shared': 3.4.14 estree-walker: 2.0.2 magic-string: 0.30.5 - postcss: 8.4.33 - source-map-js: 1.0.2 + postcss: 8.4.38 + source-map-js: 1.2.1 dev: true /@vue/compiler-ssr@3.4.14: @@ -18348,7 +18348,7 @@ packages: dependencies: nanoid: 3.3.7 picocolors: 1.0.0 - source-map-js: 1.0.2 + source-map-js: 1.2.1 dev: true /postcss@8.4.38: @@ -18358,7 +18358,6 @@ packages: nanoid: 3.3.7 picocolors: 1.1.1 source-map-js: 1.2.1 - dev: false /postgres-array@2.0.0: resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==} @@ -18803,7 +18802,7 @@ packages: hoist-non-react-statics: 3.3.2 intl-messageformat: 9.13.0 react: 17.0.2 - tslib: 2.6.2 + tslib: 2.8.1 typescript: 4.9.5 /react-intl@5.25.1(@types/react@18.3.12)(react@18.3.1)(typescript@4.9.5): @@ -18826,7 +18825,7 @@ packages: hoist-non-react-statics: 3.3.2 intl-messageformat: 9.13.0 react: 18.3.1 - tslib: 2.6.2 + tslib: 2.8.1 typescript: 4.9.5 dev: false @@ -19798,11 +19797,6 @@ packages: sort-object-keys: 1.1.3 dev: true - /source-map-js@1.0.2: - resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} - engines: {node: '>=0.10.0'} - dev: true - /source-map-js@1.2.1: resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} engines: {node: '>=0.10.0'} From 5faa12e53988e39e253fed81642a00419093345e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 10:44:48 +0100 Subject: [PATCH 079/121] Update react-dnd monorepo to ^16.0.1 (#207) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 4 ++-- packages/admin/package.json | 8 ++++---- pnpm-lock.yaml | 15 ++++++--------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 7974f23b..f8d0e733 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -52,8 +52,8 @@ "material-design-icons": "^3.0.1", "react": "^17.0.0", "react-app-polyfill": "^2.0.0", - "react-dnd": "^16.0.0", - "react-dnd-html5-backend": "^16.0.0", + "react-dnd": "^16.0.1", + "react-dnd-html5-backend": "^16.0.1", "react-dom": "^17.0.0", "react-final-form": "^6.3.1", "react-intl": "^5.25.1", diff --git a/packages/admin/package.json b/packages/admin/package.json index b23250cd..66708601 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -63,8 +63,8 @@ "history": "^4.10.1", "prettier": "^2.0.0", "react": "^17.0", - "react-dnd": "^16.0.0", - "react-dnd-html5-backend": "^16.0.0", + "react-dnd": "^16.0.1", + "react-dnd-html5-backend": "^16.0.1", "react-dom": "^17.0", "react-final-form": "^6.3.1", "react-intl": "^5.25.1", @@ -91,8 +91,8 @@ "graphql": "^15.4.0", "history": "^4.10.1", "react": "^17.0", - "react-dnd": "^16.0.0", - "react-dnd-html5-backend": "^16.0.0", + "react-dnd": "^16.0.1", + "react-dnd-html5-backend": "^16.0.1", "react-dom": "^17.0", "react-final-form": "^6.3.1", "react-intl": "^5.0.0 || ^6.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 90b5fca6..9ef98f03 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -137,10 +137,10 @@ importers: specifier: ^2.0.0 version: 2.0.0 react-dnd: - specifier: ^16.0.0 + specifier: ^16.0.1 version: 16.0.1(@types/node@18.19.8)(@types/react@17.0.75)(react@17.0.2) react-dnd-html5-backend: - specifier: ^16.0.0 + specifier: ^16.0.1 version: 16.0.1 react-dom: specifier: ^17.0.0 @@ -883,10 +883,10 @@ importers: specifier: ^17.0 version: 17.0.2 react-dnd: - specifier: ^16.0.0 + specifier: ^16.0.1 version: 16.0.1(@types/node@18.19.8)(@types/react@17.0.75)(react@17.0.2) react-dnd-html5-backend: - specifier: ^16.0.0 + specifier: ^16.0.1 version: 16.0.1 react-dom: specifier: ^17.0 @@ -6564,7 +6564,7 @@ packages: '@types/react': 17.0.75 prop-types: 15.8.1 react: 17.0.2 - react-is: 18.2.0 + react-is: 18.3.1 /@mui/utils@5.16.6(@types/react@17.0.75)(react@17.0.2): resolution: {integrity: sha512-tWiQqlhxAt3KENNiSRL+DIn9H5xNVK6Jjf70x3PnfQPz1MPBdh7yyIcAyVBT9xiw7hP3SomRhPR7hzBMBCjqEA==} @@ -18425,7 +18425,7 @@ packages: dependencies: '@jest/schemas': 29.6.3 ansi-styles: 5.2.0 - react-is: 18.2.0 + react-is: 18.3.1 dev: true /probe-image-size@7.2.3: @@ -18835,9 +18835,6 @@ packages: /react-is@17.0.2: resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==} - /react-is@18.2.0: - resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} - /react-is@18.3.1: resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==} From 10f3f9ab360ce486dedbe90619fedb5d9c04d026 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 10:45:05 +0100 Subject: [PATCH 080/121] Update jest monorepo (#205) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 4 ++-- packages/api/package.json | 4 ++-- pnpm-lock.yaml | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index bcc37ed4..a10a632e 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -107,12 +107,12 @@ "@types/compression": "^1.7.0", "@types/cookie-parser": "^1.4.2", "@types/express": "^4.17.8", - "@types/jest": "^27.0.0", + "@types/jest": "^27.5.2", "@types/node": "^18.0.6", "@types/node-fetch": "^2.5.12", "@types/uuid": "^8.3.0", "eslint": "^8.19.0", - "jest": "^27.0.0", + "jest": "^27.5.1", "jest-junit": "^13.2.0", "prettier": "^2.1.2", "ts-jest": "^27.1.5", diff --git a/packages/api/package.json b/packages/api/package.json index aab574e0..5b051e46 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -48,7 +48,7 @@ "@nestjs/core": "^9.4.3", "@nestjs/graphql": "^10.2.1", "@nestjs/platform-express": "^9.4.3", - "@types/jest": "^29.5.0", + "@types/jest": "^29.5.14", "@types/lodash.isequal": "^4.0.0", "@types/mime-db": "^1.43.5", "@types/multer": "^1.4.11", @@ -61,7 +61,7 @@ "eslint": "^8.0.0", "express": "^4.17.1", "graphql": "^15.5.0", - "jest": "^29.5.0", + "jest": "^29.7.0", "jest-junit": "^15.0.0", "lodash.isequal": "^4.5.0", "nestjs-console": "^8.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9ef98f03..4cca4df7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -442,7 +442,7 @@ importers: specifier: ^4.17.8 version: 4.17.21 '@types/jest': - specifier: ^27.0.0 + specifier: ^27.5.2 version: 27.5.2 '@types/node': specifier: ^18.0.6 @@ -457,7 +457,7 @@ importers: specifier: ^8.19.0 version: 8.56.0 jest: - specifier: ^27.0.0 + specifier: ^27.5.1 version: 27.5.1(ts-node@10.9.2) jest-junit: specifier: ^13.2.0 @@ -974,8 +974,8 @@ importers: specifier: ^9.4.3 version: 9.4.3(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) '@types/jest': - specifier: ^29.5.0 - version: 29.5.11 + specifier: ^29.5.14 + version: 29.5.14 '@types/lodash.isequal': specifier: ^4.0.0 version: 4.5.8 @@ -1013,7 +1013,7 @@ importers: specifier: ^15.5.0 version: 15.8.0 jest: - specifier: ^29.5.0 + specifier: ^29.7.0 version: 29.7.0(@types/node@18.19.8)(ts-node@10.9.2) jest-junit: specifier: ^15.0.0 @@ -8975,8 +8975,8 @@ packages: pretty-format: 27.5.1 dev: true - /@types/jest@29.5.11: - resolution: {integrity: sha512-S2mHmYIVe13vrm6q4kN6fLYYAka15ALQki/vgDC3mIukEOx8WJlv0kQPM+d4w8Gp6u0uSdKND04IlTXBv0rwnQ==} + /@types/jest@29.5.14: + resolution: {integrity: sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==} dependencies: expect: 29.7.0 pretty-format: 29.7.0 From aa75e4c034e7259672a712571786ef97375ab01e Mon Sep 17 00:00:00 2001 From: raphaelblum <44967610+raphaelblum@users.noreply.github.com> Date: Mon, 25 Nov 2024 10:59:02 +0100 Subject: [PATCH 081/121] Move scope parts to brevo config (#147) Co-authored-by: Thomas Dax --- .changeset/witty-coats-perform.md | 25 +++++++++++++++++++ demo/admin/src/App.tsx | 1 + demo/admin/src/common/MasterMenu.tsx | 9 +------ .../brevoConfiguration/BrevoConfigPage.tsx | 23 +++++++---------- .../src/brevoContacts/BrevoContactsPage.tsx | 4 +-- .../admin/src/common/BrevoConfigProvider.tsx | 2 ++ .../src/emailCampaigns/EmailCampaignsPage.tsx | 5 ++-- packages/admin/src/index.ts | 2 +- .../src/targetGroups/TargetGroupsPage.tsx | 11 +++----- packages/api/schema.gql | 12 ++++----- 10 files changed, 53 insertions(+), 41 deletions(-) create mode 100644 .changeset/witty-coats-perform.md diff --git a/.changeset/witty-coats-perform.md b/.changeset/witty-coats-perform.md new file mode 100644 index 00000000..f6622098 --- /dev/null +++ b/.changeset/witty-coats-perform.md @@ -0,0 +1,25 @@ +--- +"@comet/brevo-admin": major +--- + +Define `scopeParts` in `BrevoConfig` + +Previously the `scopeParts` were passed to the functions: + +- createBrevoContactsPage +- createTargetGroupsPage +- createEmailCampaignsPage +- createBrevoConfigPage + +Now they are defined once in the `BrevoConfig`: + +```tsx + + {children} + +``` diff --git a/demo/admin/src/App.tsx b/demo/admin/src/App.tsx index 82b84afc..7db3d016 100644 --- a/demo/admin/src/App.tsx +++ b/demo/admin/src/App.tsx @@ -84,6 +84,7 @@ export function App() { { return `${config.campaignUrl}/block-preview/${scope.domain}/${scope.language}`; diff --git a/demo/admin/src/common/MasterMenu.tsx b/demo/admin/src/common/MasterMenu.tsx index 789b8141..12e421c0 100644 --- a/demo/admin/src/common/MasterMenu.tsx +++ b/demo/admin/src/common/MasterMenu.tsx @@ -1,5 +1,5 @@ import { Assets, Dashboard, Mail, PageTree, Wrench } from "@comet/admin-icons"; -import { createBrevoConfigPage, createBrevoContactsPage, createEmailCampaignsPage, createTargetGroupsPage } from "@comet/brevo-admin"; +import { BrevoConfigPage, createBrevoContactsPage, createEmailCampaignsPage, createTargetGroupsPage } from "@comet/brevo-admin"; import { AllCategories, ContentScopeIndicator, @@ -37,7 +37,6 @@ const RedirectsPage = createRedirectsPage({ scopeParts: ["domain"] }); const getMasterMenuData = ({ brevoContactConfig }: { brevoContactConfig: BrevoContactConfig }): MasterMenuData => { const BrevoContactsPage = createBrevoContactsPage({ - scopeParts: ["domain", "language"], additionalAttributesFragment: brevoContactConfig.additionalAttributesFragment, additionalGridFields: brevoContactConfig.additionalGridFields, additionalFormFields: brevoContactConfig.additionalFormFields, @@ -45,7 +44,6 @@ const getMasterMenuData = ({ brevoContactConfig }: { brevoContactConfig: BrevoCo }); const TargetGroupsPage = createTargetGroupsPage({ - scopeParts: ["domain", "language"], additionalFormFields: additionalFormConfig.additionalFormFields, exportTargetGroupOptions: { additionalAttributesFragment: brevoContactConfig.additionalAttributesFragment, @@ -56,14 +54,9 @@ const getMasterMenuData = ({ brevoContactConfig }: { brevoContactConfig: BrevoCo }); const CampaignsPage = createEmailCampaignsPage({ - scopeParts: ["domain", "language"], EmailCampaignContentBlock, }); - const BrevoConfigPage = createBrevoConfigPage({ - scopeParts: ["domain", "language"], - }); - return [ { type: "route", diff --git a/packages/admin/src/brevoConfiguration/BrevoConfigPage.tsx b/packages/admin/src/brevoConfiguration/BrevoConfigPage.tsx index f8c8163b..4522044c 100644 --- a/packages/admin/src/brevoConfiguration/BrevoConfigPage.tsx +++ b/packages/admin/src/brevoConfiguration/BrevoConfigPage.tsx @@ -1,22 +1,17 @@ import { useContentScope } from "@comet/cms-admin"; import * as React from "react"; +import { useBrevoConfig } from "../common/BrevoConfigProvider"; import { BrevoConfigForm } from "./BrevoConfigForm"; -interface CreateBrevoConfigPageOptions { - scopeParts: string[]; -} - -export function createBrevoConfigPage({ scopeParts }: CreateBrevoConfigPageOptions) { - function BrevoConfigPage(): JSX.Element { - const { scope: completeScope } = useContentScope(); +export function BrevoConfigPage(): JSX.Element { + const { scopeParts } = useBrevoConfig(); + const { scope: completeScope } = useContentScope(); - const scope = scopeParts.reduce((acc, scopePart) => { - acc[scopePart] = completeScope[scopePart]; - return acc; - }, {} as { [key: string]: unknown }); + const scope = scopeParts.reduce((acc, scopePart) => { + acc[scopePart] = completeScope[scopePart]; + return acc; + }, {} as { [key: string]: unknown }); - return ; - } - return BrevoConfigPage; + return ; } diff --git a/packages/admin/src/brevoContacts/BrevoContactsPage.tsx b/packages/admin/src/brevoContacts/BrevoContactsPage.tsx index 8ad01cb0..15c59038 100644 --- a/packages/admin/src/brevoContacts/BrevoContactsPage.tsx +++ b/packages/admin/src/brevoContacts/BrevoContactsPage.tsx @@ -4,11 +4,11 @@ import { DocumentNode } from "graphql"; import * as React from "react"; import { useIntl } from "react-intl"; +import { useBrevoConfig } from "../common/BrevoConfigProvider"; import { BrevoContactsGrid } from "./BrevoContactsGrid"; import { BrevoContactForm, EditBrevoContactFormValues } from "./form/BrevoContactForm"; interface CreateContactsPageOptions { - scopeParts: string[]; additionalAttributesFragment?: { name: string; fragment: DocumentNode }; additionalGridFields?: GridColDef[]; additionalFormFields?: React.ReactNode; @@ -16,7 +16,6 @@ interface CreateContactsPageOptions { } function createBrevoContactsPage({ - scopeParts, additionalAttributesFragment, additionalFormFields, additionalGridFields, @@ -24,6 +23,7 @@ function createBrevoContactsPage({ }: CreateContactsPageOptions) { function BrevoContactsPage(): JSX.Element { const intl = useIntl(); + const { scopeParts } = useBrevoConfig(); const { scope: completeScope } = useContentScope(); const scope = scopeParts.reduce((acc, scopePart) => { diff --git a/packages/admin/src/common/BrevoConfigProvider.tsx b/packages/admin/src/common/BrevoConfigProvider.tsx index bce4926c..3f067da4 100644 --- a/packages/admin/src/common/BrevoConfigProvider.tsx +++ b/packages/admin/src/common/BrevoConfigProvider.tsx @@ -3,6 +3,7 @@ import React from "react"; export interface BrevoConfig { apiUrl: string; + scopeParts: string[]; resolvePreviewUrlForScope: (scope: ContentScopeInterface) => string; } @@ -19,6 +20,7 @@ export const BrevoConfigProvider = ({ children, value }: React.PropsWithChildren interface UseBrevoConfigReturn { apiUrl: string; previewUrl: string; + scopeParts: string[]; } export const useBrevoConfig = (): UseBrevoConfigReturn => { diff --git a/packages/admin/src/emailCampaigns/EmailCampaignsPage.tsx b/packages/admin/src/emailCampaigns/EmailCampaignsPage.tsx index 13b08af5..e09910b3 100644 --- a/packages/admin/src/emailCampaigns/EmailCampaignsPage.tsx +++ b/packages/admin/src/emailCampaigns/EmailCampaignsPage.tsx @@ -4,18 +4,19 @@ import { ContentScopeIndicator, useContentScope } from "@comet/cms-admin"; import * as React from "react"; import { useIntl } from "react-intl"; +import { useBrevoConfig } from "../common/BrevoConfigProvider"; import { EmailCampaignsGrid } from "./EmailCampaignsGrid"; import { EmailCampaignForm } from "./form/EmailCampaignForm"; import { EmailCampaignStatistics } from "./statistics/EmailCampaignStatistics"; import { EmailCampaignView } from "./view/EmailCampaignView"; interface CreateEmailCampaignsPageOptions { - scopeParts: string[]; EmailCampaignContentBlock: BlockInterface; } -export function createEmailCampaignsPage({ scopeParts, EmailCampaignContentBlock }: CreateEmailCampaignsPageOptions) { +export function createEmailCampaignsPage({ EmailCampaignContentBlock }: CreateEmailCampaignsPageOptions) { function EmailCampaignsPage(): JSX.Element { + const { scopeParts } = useBrevoConfig(); const { scope: completeScope } = useContentScope(); const intl = useIntl(); diff --git a/packages/admin/src/index.ts b/packages/admin/src/index.ts index 88a73291..74d8f1b9 100644 --- a/packages/admin/src/index.ts +++ b/packages/admin/src/index.ts @@ -1,4 +1,4 @@ -export { createBrevoConfigPage } from "./brevoConfiguration/BrevoConfigPage"; +export { BrevoConfigPage } from "./brevoConfiguration/BrevoConfigPage"; export { createBrevoContactsPage } from "./brevoContacts/BrevoContactsPage"; export { EditBrevoContactFormValues } from "./brevoContacts/form/BrevoContactForm"; export { BrevoConfig, BrevoConfigProvider, useBrevoConfig } from "./common/BrevoConfigProvider"; diff --git a/packages/admin/src/targetGroups/TargetGroupsPage.tsx b/packages/admin/src/targetGroups/TargetGroupsPage.tsx index 9fa9be8c..ffceba69 100644 --- a/packages/admin/src/targetGroups/TargetGroupsPage.tsx +++ b/packages/admin/src/targetGroups/TargetGroupsPage.tsx @@ -4,11 +4,11 @@ import { DocumentNode } from "graphql"; import * as React from "react"; import { useIntl } from "react-intl"; +import { useBrevoConfig } from "../common/BrevoConfigProvider"; import { EditTargetGroupFinalFormValues, TargetGroupForm } from "./TargetGroupForm"; import { AdditionalContactAttributesType, TargetGroupsGrid } from "./TargetGroupsGrid"; interface CreateContactsPageOptions { - scopeParts: string[]; additionalFormFields?: React.ReactNode; exportTargetGroupOptions?: { additionalAttributesFragment: { name: string; fragment: DocumentNode }; @@ -19,14 +19,9 @@ interface CreateContactsPageOptions { valuesToOutput?: (values: EditTargetGroupFinalFormValues) => EditTargetGroupFinalFormValues; } -export function createTargetGroupsPage({ - scopeParts, - additionalFormFields, - nodeFragment, - input2State, - exportTargetGroupOptions, -}: CreateContactsPageOptions) { +export function createTargetGroupsPage({ additionalFormFields, nodeFragment, input2State, exportTargetGroupOptions }: CreateContactsPageOptions) { function TargetGroupsPage(): JSX.Element { + const { scopeParts } = useBrevoConfig(); const { scope: completeScope } = useContentScope(); const intl = useIntl(); diff --git a/packages/api/schema.gql b/packages/api/schema.gql index 4b82caaf..d4627760 100644 --- a/packages/api/schema.gql +++ b/packages/api/schema.gql @@ -1,3 +1,9 @@ +type User { + id: String! + name: String! + email: String! +} + type CurrentUserPermission { permission: String! contentScopes: [JSONObject!]! @@ -37,12 +43,6 @@ enum FocalPoint { SOUTHEAST } -type User { - id: String! - name: String! - email: String! -} - type BrevoApiSender { id: ID! name: String! From 7cfa5d65fcd92586965efd566934af401e531b05 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 15:57:46 +0100 Subject: [PATCH 082/121] Update dependency @types/async to ^3.2.24 (#211) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index a10a632e..18e2a843 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -102,7 +102,7 @@ "@nestjs/cli": "^9.5.0", "@nestjs/schematics": "^9.2.0", "@nestjs/testing": "^9.4.3", - "@types/async": "^3.2.5", + "@types/async": "^3.2.24", "@types/cli-progress": "^3.8.0", "@types/compression": "^1.7.0", "@types/cookie-parser": "^1.4.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4cca4df7..67e4d277 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -427,7 +427,7 @@ importers: specifier: ^9.4.3 version: 9.4.3(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(@nestjs/platform-express@9.4.3) '@types/async': - specifier: ^3.2.5 + specifier: ^3.2.24 version: 3.2.24 '@types/cli-progress': specifier: ^3.8.0 From 28ed6311e8ecc49d10285dbd7b8cd4d128892f98 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 08:18:25 +0100 Subject: [PATCH 083/121] Update dependency @types/cli-progress to ^3.11.6 (#212) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index 18e2a843..e4227287 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -103,7 +103,7 @@ "@nestjs/schematics": "^9.2.0", "@nestjs/testing": "^9.4.3", "@types/async": "^3.2.24", - "@types/cli-progress": "^3.8.0", + "@types/cli-progress": "^3.11.6", "@types/compression": "^1.7.0", "@types/cookie-parser": "^1.4.2", "@types/express": "^4.17.8", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 67e4d277..346230f8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -430,8 +430,8 @@ importers: specifier: ^3.2.24 version: 3.2.24 '@types/cli-progress': - specifier: ^3.8.0 - version: 3.11.5 + specifier: ^3.11.6 + version: 3.11.6 '@types/compression': specifier: ^1.7.0 version: 1.7.5 @@ -8739,8 +8739,8 @@ packages: /@types/chroma-js@2.4.3: resolution: {integrity: sha512-1ly5ly/7S/YF8aD7MxUQnFOZxdegimuOunJl0xDsLlguu5JrwuSTVGVH3UpIUlh6YauI0RMNT4cqjBonhgbdIQ==} - /@types/cli-progress@3.11.5: - resolution: {integrity: sha512-D4PbNRbviKyppS5ivBGyFO29POlySLmA2HyUFE4p5QGazAMM3CwkKWcvTl8gvElSuxRh6FPKL8XmidX873ou4g==} + /@types/cli-progress@3.11.6: + resolution: {integrity: sha512-cE3+jb9WRlu+uOSAugewNpITJDt1VF8dHOopPO4IABFc3SXYL5WE/+PTz/FCdZRRfIujiWW3n3aMbv1eIGVRWA==} dependencies: '@types/node': 18.19.8 dev: true From 4cde1df065a9a7ef37525a3486f35ddd0802c813 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 08:18:40 +0100 Subject: [PATCH 084/121] Update dependency @types/multer to ^1.4.12 (#218) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/api/package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/api/package.json b/packages/api/package.json index 5b051e46..8e26f4ba 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -51,7 +51,7 @@ "@types/jest": "^29.5.14", "@types/lodash.isequal": "^4.0.0", "@types/mime-db": "^1.43.5", - "@types/multer": "^1.4.11", + "@types/multer": "^1.4.12", "@types/node-fetch": "^2.5.12", "@types/rimraf": "^3.0.0", "@types/uuid": "^8.3.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 346230f8..25bcd066 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -983,8 +983,8 @@ importers: specifier: ^1.43.5 version: 1.43.5 '@types/multer': - specifier: ^1.4.11 - version: 1.4.11 + specifier: ^1.4.12 + version: 1.4.12 '@types/node-fetch': specifier: ^2.5.12 version: 2.6.11 @@ -9084,8 +9084,8 @@ packages: resolution: {integrity: sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==} dev: true - /@types/multer@1.4.11: - resolution: {integrity: sha512-svK240gr6LVWvv3YGyhLlA+6LRRWA4mnGIU7RcNmgjBYFl6665wcXrRfxGp5tEPVHUNm5FMcmq7too9bxCwX/w==} + /@types/multer@1.4.12: + resolution: {integrity: sha512-pQ2hoqvXiJt2FP9WQVLPRO+AmiIm/ZYkavPlIQnx282u4ZrVdztx0pkh3jjpQt0Kz+YI0YhSG264y08UJKoUQg==} dependencies: '@types/express': 4.17.21 dev: true From 818aa16fd4e7027b38dc057986159fbaa0d62a38 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 08:18:54 +0100 Subject: [PATCH 085/121] Update dependency @types/lodash.isequal to ^4.5.8 (#217) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- packages/admin/package.json | 2 +- packages/api/package.json | 2 +- pnpm-lock.yaml | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index f8d0e733..952f5f9e 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -74,7 +74,7 @@ "@graphql-codegen/near-operation-file-preset": "^2.5.0", "@graphql-codegen/typescript": "^2.8.8", "@graphql-codegen/typescript-operations": "^2.5.13", - "@types/lodash.isequal": "^4.0.0", + "@types/lodash.isequal": "^4.5.8", "@types/node": "^18.0.0", "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", diff --git a/packages/admin/package.json b/packages/admin/package.json index 66708601..bdb72b0d 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -52,7 +52,7 @@ "@mui/system": "^5.16.7", "@mui/x-data-grid": "^5.17.26", "@types/file-saver": "^2.0.7", - "@types/lodash.isequal": "^4.0.0", + "@types/lodash.isequal": "^4.5.8", "@types/react": "^17.0", "@types/react-dom": "^17.0.0", "@types/react-router": "^5.0.3", diff --git a/packages/api/package.json b/packages/api/package.json index 8e26f4ba..d2a83c42 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -49,7 +49,7 @@ "@nestjs/graphql": "^10.2.1", "@nestjs/platform-express": "^9.4.3", "@types/jest": "^29.5.14", - "@types/lodash.isequal": "^4.0.0", + "@types/lodash.isequal": "^4.5.8", "@types/mime-db": "^1.43.5", "@types/multer": "^1.4.12", "@types/node-fetch": "^2.5.12", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 25bcd066..f9b38c97 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -198,7 +198,7 @@ importers: specifier: ^2.5.13 version: 2.5.13(graphql@15.8.0) '@types/lodash.isequal': - specifier: ^4.0.0 + specifier: ^4.5.8 version: 4.5.8 '@types/node': specifier: ^18.0.0 @@ -850,7 +850,7 @@ importers: specifier: ^2.0.7 version: 2.0.7 '@types/lodash.isequal': - specifier: ^4.0.0 + specifier: ^4.5.8 version: 4.5.8 '@types/react': specifier: ^17.0 @@ -977,7 +977,7 @@ importers: specifier: ^29.5.14 version: 29.5.14 '@types/lodash.isequal': - specifier: ^4.0.0 + specifier: ^4.5.8 version: 4.5.8 '@types/mime-db': specifier: ^1.43.5 From 768263e00fd49f78ab7f4b92cf61a378df8e967f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 08:19:11 +0100 Subject: [PATCH 086/121] Update dependency @types/fs-extra to ^9.0.13 (#216) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- 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 6326f251..6d77a96d 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -59,7 +59,7 @@ "@graphql-codegen/typescript": "^2.8.8", "@graphql-codegen/typescript-operations": "^2.5.13", "@types/draft-js": "^0.11.9", - "@types/fs-extra": "^9.0.0", + "@types/fs-extra": "^9.0.13", "@types/node": "^18.0.0", "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", diff --git a/demo/site/package.json b/demo/site/package.json index a0f1d889..966453ab 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -60,7 +60,7 @@ "@graphql-codegen/typescript": "^2.8.8", "@graphql-codegen/typescript-operations": "^2.5.13", "@types/draft-js": "^0.11.9", - "@types/fs-extra": "^9.0.0", + "@types/fs-extra": "^9.0.13", "@types/node": "^18.0.0", "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f9b38c97..924c7927 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -599,7 +599,7 @@ importers: specifier: ^0.11.9 version: 0.11.17 '@types/fs-extra': - specifier: ^9.0.0 + specifier: ^9.0.13 version: 9.0.13 '@types/node': specifier: ^18.0.0 @@ -741,7 +741,7 @@ importers: specifier: ^0.11.9 version: 0.11.17 '@types/fs-extra': - specifier: ^9.0.0 + specifier: ^9.0.13 version: 9.0.13 '@types/node': specifier: ^18.0.0 From b652adbe045e51895821be6ce6826f0d40078b25 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 09:12:38 +0100 Subject: [PATCH 087/121] Update dependency @types/react-router to ^5.1.20 (#220) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- packages/admin/package.json | 2 +- pnpm-lock.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 952f5f9e..712b292e 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -78,7 +78,7 @@ "@types/node": "^18.0.0", "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", - "@types/react-router": "^5.0.3", + "@types/react-router": "^5.1.20", "@types/react-router-dom": "^5.1.7", "@types/webpack-env": "^1.13.9", "babel-loader": "^8.0.0", diff --git a/packages/admin/package.json b/packages/admin/package.json index bdb72b0d..7acb30a6 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -55,7 +55,7 @@ "@types/lodash.isequal": "^4.5.8", "@types/react": "^17.0", "@types/react-dom": "^17.0.0", - "@types/react-router": "^5.0.3", + "@types/react-router": "^5.1.20", "draft-js": "^0.11.7", "eslint": "^8.0.0", "final-form": "^4.16.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 924c7927..7a3488d0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -210,7 +210,7 @@ importers: specifier: ^17.0.0 version: 17.0.25 '@types/react-router': - specifier: ^5.0.3 + specifier: ^5.1.20 version: 5.1.20 '@types/react-router-dom': specifier: ^5.1.7 @@ -859,7 +859,7 @@ importers: specifier: ^17.0.0 version: 17.0.25 '@types/react-router': - specifier: ^5.0.3 + specifier: ^5.1.20 version: 5.1.20 draft-js: specifier: ^0.11.7 From c4e8e8a80528fcfcf5f6445378e01be0259ff414 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 09:12:53 +0100 Subject: [PATCH 088/121] Update dependency @types/node-fetch to ^2.6.12 (#219) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- packages/api/package.json | 2 +- pnpm-lock.yaml | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index e4227287..ab6a8d78 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -109,7 +109,7 @@ "@types/express": "^4.17.8", "@types/jest": "^27.5.2", "@types/node": "^18.0.6", - "@types/node-fetch": "^2.5.12", + "@types/node-fetch": "^2.6.12", "@types/uuid": "^8.3.0", "eslint": "^8.19.0", "jest": "^27.5.1", diff --git a/packages/api/package.json b/packages/api/package.json index d2a83c42..01e5baad 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -52,7 +52,7 @@ "@types/lodash.isequal": "^4.5.8", "@types/mime-db": "^1.43.5", "@types/multer": "^1.4.12", - "@types/node-fetch": "^2.5.12", + "@types/node-fetch": "^2.6.12", "@types/rimraf": "^3.0.0", "@types/uuid": "^8.3.0", "chokidar-cli": "^2.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7a3488d0..a3cb633a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -448,8 +448,8 @@ importers: specifier: ^18.0.6 version: 18.19.8 '@types/node-fetch': - specifier: ^2.5.12 - version: 2.6.11 + specifier: ^2.6.12 + version: 2.6.12 '@types/uuid': specifier: ^8.3.0 version: 8.3.4 @@ -986,8 +986,8 @@ importers: specifier: ^1.4.12 version: 1.4.12 '@types/node-fetch': - specifier: ^2.5.12 - version: 2.6.11 + specifier: ^2.6.12 + version: 2.6.12 '@types/rimraf': specifier: ^3.0.0 version: 3.0.2 @@ -9096,8 +9096,8 @@ packages: '@types/node': 18.19.8 dev: false - /@types/node-fetch@2.6.11: - resolution: {integrity: sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==} + /@types/node-fetch@2.6.12: + resolution: {integrity: sha512-8nneRWKCg3rMtF69nLQJnOYUcbafYeFSjqkw3jCRLsqkWFlHaoQrr5mXmofFGOx3DKn7UfmBMyov8ySvLRVldA==} dependencies: '@types/node': 18.19.8 form-data: 4.0.0 From 99530a51606ce39bf69ccacf91daa036b0978f3c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 09:13:09 +0100 Subject: [PATCH 089/121] Update dependency @types/draft-js to ^0.11.18 (#215) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/campaign/package.json | 2 +- demo/site/package.json | 2 +- pnpm-lock.yaml | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/demo/campaign/package.json b/demo/campaign/package.json index 6d77a96d..72226ff4 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -58,7 +58,7 @@ "@graphql-codegen/near-operation-file-preset": "^2.5.0", "@graphql-codegen/typescript": "^2.8.8", "@graphql-codegen/typescript-operations": "^2.5.13", - "@types/draft-js": "^0.11.9", + "@types/draft-js": "^0.11.18", "@types/fs-extra": "^9.0.13", "@types/node": "^18.0.0", "@types/react": "^18.0.0", diff --git a/demo/site/package.json b/demo/site/package.json index 966453ab..448d8c3f 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -59,7 +59,7 @@ "@graphql-codegen/near-operation-file-preset": "^2.5.0", "@graphql-codegen/typescript": "^2.8.8", "@graphql-codegen/typescript-operations": "^2.5.13", - "@types/draft-js": "^0.11.9", + "@types/draft-js": "^0.11.18", "@types/fs-extra": "^9.0.13", "@types/node": "^18.0.0", "@types/react": "^18.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a3cb633a..578fdd39 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -596,8 +596,8 @@ importers: specifier: ^2.5.13 version: 2.5.13(graphql@15.8.0) '@types/draft-js': - specifier: ^0.11.9 - version: 0.11.17 + specifier: ^0.11.18 + version: 0.11.18 '@types/fs-extra': specifier: ^9.0.13 version: 9.0.13 @@ -738,8 +738,8 @@ importers: specifier: ^2.5.13 version: 2.5.13(graphql@15.8.0) '@types/draft-js': - specifier: ^0.11.9 - version: 0.11.17 + specifier: ^0.11.18 + version: 0.11.18 '@types/fs-extra': specifier: ^9.0.13 version: 9.0.13 @@ -8791,8 +8791,8 @@ packages: resolution: {integrity: sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==} dev: false - /@types/draft-js@0.11.17: - resolution: {integrity: sha512-th0OwSPftG2r5rvGxS7nt8I7hcWMlrQ9OJcNx6MdXAwO797W78IGEsGWonO+turVBWEd3qylZRGBVtpEX9vSYQ==} + /@types/draft-js@0.11.18: + resolution: {integrity: sha512-lP6yJ+EKv5tcG1dflWgDKeezdwBa8wJ7KkiNrrHqXuXhl/VGes1SKjEfKHDZqOz19KQbrAhFvNhDPWwnQXYZGQ==} dependencies: '@types/react': 17.0.75 immutable: 3.7.6 From f23375ff92a5b0e3025b08c5b7f2b129581a13cd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 09:13:24 +0100 Subject: [PATCH 090/121] Update dependency @types/cookie-parser to ^1.4.8 (#214) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- pnpm-lock.yaml | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index ab6a8d78..944d1f08 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -105,7 +105,7 @@ "@types/async": "^3.2.24", "@types/cli-progress": "^3.11.6", "@types/compression": "^1.7.0", - "@types/cookie-parser": "^1.4.2", + "@types/cookie-parser": "^1.4.8", "@types/express": "^4.17.8", "@types/jest": "^27.5.2", "@types/node": "^18.0.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 578fdd39..aa6f5e99 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -436,8 +436,8 @@ importers: specifier: ^1.7.0 version: 1.7.5 '@types/cookie-parser': - specifier: ^1.4.2 - version: 1.4.6 + specifier: ^1.4.8 + version: 1.4.8(@types/express@4.17.21) '@types/express': specifier: ^4.17.8 version: 4.17.21 @@ -8772,8 +8772,10 @@ packages: resolution: {integrity: sha512-QVSSvno3dE0MgO76pJhmv4Qyi/j0Yk9pBp0Y7TJ2Tlj+KCgJWY6qX7nnxCOLkZ3VYRSIk1WTxCvwUSdx6CCLdg==} dev: false - /@types/cookie-parser@1.4.6: - resolution: {integrity: sha512-KoooCrD56qlLskXPLGUiJxOMnv5l/8m7cQD2OxJ73NPMhuSz9PmvwRD6EpjDyKBVrdJDdQ4bQK7JFNHnNmax0w==} + /@types/cookie-parser@1.4.8(@types/express@4.17.21): + resolution: {integrity: sha512-l37JqFrOJ9yQfRQkljb41l0xVphc7kg5JTjjr+pLRZ0IyZ49V4BQ8vbF4Ut2C2e+WH4al3xD3ZwYwIUfnbT4NQ==} + peerDependencies: + '@types/express': '*' dependencies: '@types/express': 4.17.21 dev: true From 6a7051ce6f93d26bf8f9c3304103c2776a807e5e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 09:46:29 +0100 Subject: [PATCH 091/121] Update dependency @types/compression to ^1.7.5 (#213) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index 944d1f08..70ef0460 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -104,7 +104,7 @@ "@nestjs/testing": "^9.4.3", "@types/async": "^3.2.24", "@types/cli-progress": "^3.11.6", - "@types/compression": "^1.7.0", + "@types/compression": "^1.7.5", "@types/cookie-parser": "^1.4.8", "@types/express": "^4.17.8", "@types/jest": "^27.5.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aa6f5e99..f2f32e61 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -433,7 +433,7 @@ importers: specifier: ^3.11.6 version: 3.11.6 '@types/compression': - specifier: ^1.7.0 + specifier: ^1.7.5 version: 1.7.5 '@types/cookie-parser': specifier: ^1.4.8 From f52962d3986d0a5d0f11332f6335e228d2abe5a5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 09:47:11 +0100 Subject: [PATCH 092/121] Update dependency @types/rimraf to ^3.0.2 (#222) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/api/package.json | 2 +- pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/api/package.json b/packages/api/package.json index 01e5baad..769509ff 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -53,7 +53,7 @@ "@types/mime-db": "^1.43.5", "@types/multer": "^1.4.12", "@types/node-fetch": "^2.6.12", - "@types/rimraf": "^3.0.0", + "@types/rimraf": "^3.0.2", "@types/uuid": "^8.3.0", "chokidar-cli": "^2.1.0", "class-transformer": "^0.5.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f2f32e61..01d95951 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -989,7 +989,7 @@ importers: specifier: ^2.6.12 version: 2.6.12 '@types/rimraf': - specifier: ^3.0.0 + specifier: ^3.0.2 version: 3.0.2 '@types/uuid': specifier: ^8.3.0 From c0162ddeff32319f9c023fe15cadc5b40004b990 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 12:53:07 +0100 Subject: [PATCH 093/121] Update dependency @types/uuid to ^8.3.4 (#225) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- packages/api/package.json | 2 +- pnpm-lock.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index 70ef0460..4c2b4d38 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -110,7 +110,7 @@ "@types/jest": "^27.5.2", "@types/node": "^18.0.6", "@types/node-fetch": "^2.6.12", - "@types/uuid": "^8.3.0", + "@types/uuid": "^8.3.4", "eslint": "^8.19.0", "jest": "^27.5.1", "jest-junit": "^13.2.0", diff --git a/packages/api/package.json b/packages/api/package.json index 769509ff..b3845766 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -54,7 +54,7 @@ "@types/multer": "^1.4.12", "@types/node-fetch": "^2.6.12", "@types/rimraf": "^3.0.2", - "@types/uuid": "^8.3.0", + "@types/uuid": "^8.3.4", "chokidar-cli": "^2.1.0", "class-transformer": "^0.5.1", "class-validator": "^0.14.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 01d95951..4e02d44f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -451,7 +451,7 @@ importers: specifier: ^2.6.12 version: 2.6.12 '@types/uuid': - specifier: ^8.3.0 + specifier: ^8.3.4 version: 8.3.4 eslint: specifier: ^8.19.0 @@ -992,7 +992,7 @@ importers: specifier: ^3.0.2 version: 3.0.2 '@types/uuid': - specifier: ^8.3.0 + specifier: ^8.3.4 version: 8.3.4 chokidar-cli: specifier: ^2.1.0 From 5c14c285a038e9b334c2fab821edd23537d408d7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 12:53:20 +0100 Subject: [PATCH 094/121] Update dependency @types/webpack-env to ^1.18.5 (#226) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 712b292e..cce51a4e 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -80,7 +80,7 @@ "@types/react-dom": "^17.0.0", "@types/react-router": "^5.1.20", "@types/react-router-dom": "^5.1.7", - "@types/webpack-env": "^1.13.9", + "@types/webpack-env": "^1.18.5", "babel-loader": "^8.0.0", "babel-preset-react-app": "^10.0.1", "chokidar-cli": "^2.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4e02d44f..4cd40d97 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -216,8 +216,8 @@ importers: specifier: ^5.1.7 version: 5.3.3 '@types/webpack-env': - specifier: ^1.13.9 - version: 1.18.4 + specifier: ^1.18.5 + version: 1.18.5 babel-loader: specifier: ^8.0.0 version: 8.3.0(@babel/core@7.23.7)(webpack@5.94.0) @@ -9311,8 +9311,8 @@ packages: /@types/validator@13.12.2: resolution: {integrity: sha512-6SlHBzUW8Jhf3liqrGGXyTJSIFe4nqlJ5A5KaMZ2l/vbM3Wh3KSybots/wfWVzNLK4D1NZluDlSQIbIEPx6oyA==} - /@types/webpack-env@1.18.4: - resolution: {integrity: sha512-I6e+9+HtWADAWeeJWDFQtdk4EVSAbj6Rtz4q8fJ7mSr1M0jzlFcs8/HZ+Xb5SHzVm1dxH7aUiI+A8kA8Gcrm0A==} + /@types/webpack-env@1.18.5: + resolution: {integrity: sha512-wz7kjjRRj8/Lty4B+Kr0LN6Ypc/3SymeCCGSbaXp2leH0ZVg/PriNiOwNj4bD4uphI7A8NXS4b6Gl373sfO5mA==} dev: true /@types/ws@8.5.10: From f84212494978623cad05565063d6eb51a424836c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 13:01:31 +0100 Subject: [PATCH 095/121] Update dependency @types/styled-components to ^5.1.34 (#224) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- 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 72226ff4..edd11c27 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -63,7 +63,7 @@ "@types/node": "^18.0.0", "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", - "@types/styled-components": "^5.0.0", + "@types/styled-components": "^5.1.34", "chokidar-cli": "^2.1.0", "dotenv-cli": "^6.0.0", "eslint": "^8.0.0", diff --git a/demo/site/package.json b/demo/site/package.json index 448d8c3f..c4198b11 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -64,7 +64,7 @@ "@types/node": "^18.0.0", "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", - "@types/styled-components": "^5.0.0", + "@types/styled-components": "^5.1.34", "chokidar-cli": "^2.1.0", "dotenv-cli": "^6.0.0", "eslint": "^8.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4cd40d97..608eea3f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -611,7 +611,7 @@ importers: specifier: ^18.0.0 version: 18.3.1 '@types/styled-components': - specifier: ^5.0.0 + specifier: ^5.1.34 version: 5.1.34 chokidar-cli: specifier: ^2.1.0 @@ -753,7 +753,7 @@ importers: specifier: ^18.0.0 version: 18.3.1 '@types/styled-components': - specifier: ^5.0.0 + specifier: ^5.1.34 version: 5.1.34 chokidar-cli: specifier: ^2.1.0 From 2b17adb96df9b64523bad33d77a8076885d3b822 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 13:27:57 +0100 Subject: [PATCH 096/121] Update dependency @faker-js/faker to ^8.4.1 (#229) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/api/package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/demo/api/package.json b/demo/api/package.json index 4c2b4d38..f1cbb6c4 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -52,7 +52,7 @@ "@comet/blocks-api": "^7.7.0", "@comet/brevo-api": "workspace:*", "@comet/cms-api": "^7.7.0", - "@faker-js/faker": "^8.3.1", + "@faker-js/faker": "^8.4.1", "@hapi/accept": "^5.0.2", "@kubernetes/client-node": "^0.18.0", "@mikro-orm/cli": "^5.9.8", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 608eea3f..dcfa65a6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -282,8 +282,8 @@ importers: specifier: ^7.7.0 version: 7.7.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.20.0)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) '@faker-js/faker': - specifier: ^8.3.1 - version: 8.3.1 + specifier: ^8.4.1 + version: 8.4.1 '@hapi/accept': specifier: ^5.0.2 version: 5.0.2 @@ -4457,8 +4457,8 @@ packages: react-dom: 18.3.1(react@18.3.1) dev: false - /@faker-js/faker@8.3.1: - resolution: {integrity: sha512-FdgpFxY6V6rLZE9mmIBb9hM0xpfvQOSNOLnzolzKwsE1DH+gC7lEKV1p1IbR0lAYyvYd5a4u3qWJzowUkw1bIw==} + /@faker-js/faker@8.4.1: + resolution: {integrity: sha512-XQ3cU+Q8Uqmrbf2e0cIC/QN43sTBSC8KF12u29Mb47tWrt2hAgBXSgpZMj4Ao8Uk0iJcU99QsOCaIL8934obCg==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0, npm: '>=6.14.13'} dev: false From 85a2b387c753d4a7e84d3df74a0c89e137f6ea9c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 13:28:53 +0100 Subject: [PATCH 097/121] Update dependency @mui/icons-material to ^5.16.8 (#231) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- packages/admin/package.json | 4 ++-- pnpm-lock.yaml | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index cce51a4e..bdf2b299 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -35,7 +35,7 @@ "@emotion/react": "^11.9.3", "@emotion/styled": "^11.9.3", "@fontsource-variable/roboto-flex": "^5.1.0", - "@mui/icons-material": "^5.8.4", + "@mui/icons-material": "^5.16.8", "@mui/lab": "^5.0.0-alpha.173", "@mui/material": "^5.16.7", "@mui/system": "^5.16.7", diff --git a/packages/admin/package.json b/packages/admin/package.json index 7acb30a6..a52ce87b 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -47,7 +47,7 @@ "@emotion/react": "^11.9.3", "@emotion/styled": "^11.9.3", "@graphql-codegen/cli": "^2.16.5", - "@mui/icons-material": "^5.8.4", + "@mui/icons-material": "^5.16.8", "@mui/material": "^5.16.7", "@mui/system": "^5.16.7", "@mui/x-data-grid": "^5.17.26", @@ -82,7 +82,7 @@ "@comet/cms-admin": "^7.7.0", "@emotion/react": "^11.9.3", "@emotion/styled": "^11.9.3", - "@mui/icons-material": "^5.8.4", + "@mui/icons-material": "^5.16.8", "@mui/material": "^5.16.7", "@mui/system": "^5.16.7", "@mui/x-data-grid": "^5.17.26", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dcfa65a6..348790a1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -86,8 +86,8 @@ importers: specifier: ^5.1.0 version: 5.1.0 '@mui/icons-material': - specifier: ^5.8.4 - version: 5.14.5(@mui/material@5.16.7)(@types/react@17.0.75)(react@17.0.2) + specifier: ^5.16.8 + version: 5.16.8(@mui/material@5.16.7)(@types/react@17.0.75)(react@17.0.2) '@mui/lab': specifier: ^5.0.0-alpha.173 version: 5.0.0-alpha.173(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) @@ -835,8 +835,8 @@ importers: specifier: ^2.16.5 version: 2.16.5(@babel/core@7.23.7)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5) '@mui/icons-material': - specifier: ^5.8.4 - version: 5.14.5(@mui/material@5.16.7)(@types/react@17.0.75)(react@17.0.2) + specifier: ^5.16.8 + version: 5.16.8(@mui/material@5.16.7)(@types/react@17.0.75)(react@17.0.2) '@mui/material': specifier: ^5.16.7 version: 5.16.7(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) @@ -6374,18 +6374,18 @@ packages: /@mui/core-downloads-tracker@5.16.7: resolution: {integrity: sha512-RtsCt4Geed2/v74sbihWzzRs+HsIQCfclHeORh5Ynu2fS4icIKozcSubwuG7vtzq2uW3fOR1zITSP84TNt2GoQ==} - /@mui/icons-material@5.14.5(@mui/material@5.16.7)(@types/react@17.0.75)(react@17.0.2): - resolution: {integrity: sha512-OLvC3JKtBj1PO4QWVxOqULcq/oQP9SRw2SD+G5IXnthcFG0ZCFPIgAe1TI3Lo9N+96R0jRDI0plRc/unubjWHA==} + /@mui/icons-material@5.16.8(@mui/material@5.16.7)(@types/react@17.0.75)(react@17.0.2): + resolution: {integrity: sha512-2HKzTsCPbNgJq2z4tI6sLDwxKXqiiPh6L3IhuB8w+ypShE/qAI4FZQfI2o93vysQnkPB4Rw3FKSwAJWTThhHQA==} engines: {node: '>=12.0.0'} peerDependencies: '@mui/material': ^5.0.0 - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 + '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@types/react': optional: true dependencies: - '@babel/runtime': 7.23.8 + '@babel/runtime': 7.24.5 '@mui/material': 5.16.7(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@types/react': 17.0.75 react: 17.0.2 From aa350a6a2e1740c771c0993baa8d9d2c2a8f5fd0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 13:29:17 +0100 Subject: [PATCH 098/121] Update React Router to ^5.3.4 (#227) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 4 ++-- packages/admin/package.json | 8 ++++---- pnpm-lock.yaml | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index bdf2b299..39ffa70a 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -57,8 +57,8 @@ "react-dom": "^17.0.0", "react-final-form": "^6.3.1", "react-intl": "^5.25.1", - "react-router": "^5.1.2", - "react-router-dom": "^5.1.2" + "react-router": "^5.3.4", + "react-router-dom": "^5.3.4" }, "devDependencies": { "@comet/cli": "^7.7.0", diff --git a/packages/admin/package.json b/packages/admin/package.json index a52ce87b..eb84b7e5 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -68,8 +68,8 @@ "react-dom": "^17.0", "react-final-form": "^6.3.1", "react-intl": "^5.25.1", - "react-router": "^5.1.2", - "react-router-dom": "^5.1.2", + "react-router": "^5.3.4", + "react-router-dom": "^5.3.4", "rimraf": "^3.0.2", "typescript": "^4.9.5" }, @@ -96,8 +96,8 @@ "react-dom": "^17.0", "react-final-form": "^6.3.1", "react-intl": "^5.0.0 || ^6.0.0", - "react-router": "^5.1.2", - "react-router-dom": "^5.1.2" + "react-router": "^5.3.4", + "react-router-dom": "^5.3.4" }, "publishConfig": { "access": "public", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 348790a1..31ef82d1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -152,10 +152,10 @@ importers: specifier: ^5.25.1 version: 5.25.1(@types/react@17.0.75)(react@17.0.2)(typescript@4.9.5) react-router: - specifier: ^5.1.2 + specifier: ^5.3.4 version: 5.3.4(react@17.0.2) react-router-dom: - specifier: ^5.1.2 + specifier: ^5.3.4 version: 5.3.4(react@17.0.2) devDependencies: '@comet/cli': @@ -898,10 +898,10 @@ importers: specifier: ^5.25.1 version: 5.25.1(@types/react@17.0.75)(react@17.0.2)(typescript@4.9.5) react-router: - specifier: ^5.1.2 + specifier: ^5.3.4 version: 5.3.4(react@17.0.2) react-router-dom: - specifier: ^5.1.2 + specifier: ^5.3.4 version: 5.3.4(react@17.0.2) rimraf: specifier: ^3.0.2 @@ -18853,7 +18853,7 @@ packages: peerDependencies: react: '>=15' dependencies: - '@babel/runtime': 7.23.8 + '@babel/runtime': 7.24.5 history: 4.10.1 loose-envify: 1.4.0 prop-types: 15.8.1 @@ -18867,7 +18867,7 @@ packages: peerDependencies: react: '>=15' dependencies: - '@babel/runtime': 7.23.8 + '@babel/runtime': 7.24.5 history: 4.10.1 hoist-non-react-statics: 3.3.2 loose-envify: 1.4.0 From 462d51dcddbe1b1100a38d2a1984ebf898c175a1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 13:29:55 +0100 Subject: [PATCH 099/121] Update babel monorepo (#228) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- demo/campaign/package.json | 2 +- demo/site/package.json | 2 +- packages/admin/package.json | 4 +- pnpm-lock.yaml | 1138 +++++++++++++++++++---------------- 5 files changed, 623 insertions(+), 525 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 39ffa70a..fae1083e 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -24,7 +24,7 @@ }, "dependencies": { "@apollo/client": "^3.11.8", - "@babel/core": "^7.0.0", + "@babel/core": "^7.26.0", "@comet/admin": "^7.7.0", "@comet/admin-icons": "^7.7.0", "@comet/admin-rte": "^7.7.0", diff --git a/demo/campaign/package.json b/demo/campaign/package.json index edd11c27..5f76b308 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -47,7 +47,7 @@ "zod": "^3.23.8" }, "devDependencies": { - "@babel/core": "^7.16.0", + "@babel/core": "^7.26.0", "@comet/cli": "^7.7.0", "@comet/eslint-config": "^7.7.0", "@formatjs/cli": "^4.8.4", diff --git a/demo/site/package.json b/demo/site/package.json index c4198b11..ae2a5ee5 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -48,7 +48,7 @@ "ts-node": "^10.9.2" }, "devDependencies": { - "@babel/core": "^7.16.0", + "@babel/core": "^7.26.0", "@comet/cli": "^7.7.0", "@comet/eslint-config": "^7.7.0", "@formatjs/cli": "^4.8.4", diff --git a/packages/admin/package.json b/packages/admin/package.json index eb84b7e5..7031968e 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -35,8 +35,8 @@ }, "devDependencies": { "@apollo/client": "^3.11.8", - "@babel/cli": "^7.17.6", - "@babel/core": "^7.20.12", + "@babel/cli": "^7.25.9", + "@babel/core": "^7.26.0", "@comet/admin": "^7.7.0", "@comet/admin-babel-preset": "^7.7.0", "@comet/admin-date-time": "^7.7.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 31ef82d1..abef78c5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -53,8 +53,8 @@ importers: 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 + specifier: ^7.26.0 + version: 7.26.0 '@comet/admin': specifier: ^7.7.0 version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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) @@ -178,7 +178,7 @@ importers: version: 3.2.3(graphql@15.8.0) '@graphql-codegen/cli': specifier: ^2.16.5 - version: 2.16.5(@babel/core@7.23.7)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5) + version: 2.16.5(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5) '@graphql-codegen/fragment-matcher': specifier: ^2.0.1 version: 2.0.1(graphql@15.8.0) @@ -220,7 +220,7 @@ importers: version: 1.18.5 babel-loader: specifier: ^8.0.0 - version: 8.3.0(@babel/core@7.23.7)(webpack@5.94.0) + version: 8.3.0(@babel/core@7.26.0)(webpack@5.94.0) babel-preset-react-app: specifier: ^10.0.1 version: 10.0.1 @@ -533,7 +533,7 @@ importers: version: 4.15.3 next: specifier: ^14.2.18 - version: 14.2.18(@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.18(@babel/core@7.26.0)(@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 @@ -563,8 +563,8 @@ importers: version: 3.23.8 devDependencies: '@babel/core': - specifier: ^7.16.0 - version: 7.23.7 + specifier: ^7.26.0 + version: 7.26.0 '@comet/cli': specifier: ^7.7.0 version: 7.7.0(ts-node@10.9.2) @@ -582,7 +582,7 @@ importers: version: 3.2.3(graphql@15.8.0) '@graphql-codegen/cli': specifier: ^2.16.5 - version: 2.16.5(@babel/core@7.23.7)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5) + version: 2.16.5(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5) '@graphql-codegen/named-operations-object': specifier: ^2.3.1 version: 2.3.1(graphql-tag@2.12.6)(graphql@15.8.0) @@ -678,7 +678,7 @@ importers: version: 2.12.6(graphql@15.8.0) next: specifier: ^14.2.18 - version: 14.2.18(@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.18(@babel/core@7.26.0)(@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 @@ -705,8 +705,8 @@ importers: version: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) devDependencies: '@babel/core': - specifier: ^7.16.0 - version: 7.23.7 + specifier: ^7.26.0 + version: 7.26.0 '@comet/cli': specifier: ^7.7.0 version: 7.7.0(ts-node@10.9.2) @@ -724,7 +724,7 @@ importers: version: 3.2.3(graphql@15.8.0) '@graphql-codegen/cli': specifier: ^2.16.5 - version: 2.16.5(@babel/core@7.23.7)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5) + version: 2.16.5(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5) '@graphql-codegen/named-operations-object': specifier: ^2.3.1 version: 2.3.1(graphql-tag@2.12.6)(graphql@15.8.0) @@ -799,17 +799,17 @@ importers: 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) + specifier: ^7.25.9 + version: 7.25.9(@babel/core@7.26.0) '@babel/core': - specifier: ^7.20.12 - version: 7.23.7 + specifier: ^7.26.0 + version: 7.26.0 '@comet/admin': specifier: ^7.7.0 version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0 - version: 7.7.0(@babel/cli@7.23.4) + version: 7.7.0(@babel/cli@7.25.9) '@comet/admin-date-time': specifier: ^7.7.0 version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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) @@ -833,7 +833,7 @@ importers: version: 11.11.0(@emotion/react@11.11.3)(@types/react@17.0.75)(react@17.0.2) '@graphql-codegen/cli': specifier: ^2.16.5 - version: 2.16.5(@babel/core@7.23.7)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5) + version: 2.16.5(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5) '@mui/icons-material': specifier: ^5.16.8 version: 5.16.8(@mui/material@5.16.7)(@types/react@17.0.75)(react@17.0.2) @@ -1290,13 +1290,13 @@ packages: peerDependencies: graphql: '*' dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/generator': 7.23.6 '@babel/parser': 7.23.6 '@babel/runtime': 7.24.5 '@babel/traverse': 7.23.7 '@babel/types': 7.23.6 - babel-preset-fbjs: 3.4.0(@babel/core@7.23.7) + babel-preset-fbjs: 3.4.0(@babel/core@7.26.0) chalk: 4.1.2 fb-watchman: 2.0.2 fbjs: 3.0.5 @@ -2071,16 +2071,16 @@ packages: transitivePeerDependencies: - supports-color - /@babel/cli@7.23.4(@babel/core@7.23.7): - resolution: {integrity: sha512-j3luA9xGKCXVyCa5R7lJvOMM+Kc2JEnAEIgz2ggtjQ/j5YUVgfsg/WsG95bbsgq7YLHuiCOzMnoSasuY16qiCw==} + /@babel/cli@7.25.9(@babel/core@7.26.0): + resolution: {integrity: sha512-I+02IfrTiSanpxJBlZQYb18qCxB6c2Ih371cVpfgIrPQrjAYkf45XxomTJOG8JBWX5GY35/+TmhCMdJ4ZPkL8Q==} engines: {node: '>=6.9.0'} hasBin: true peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 - '@jridgewell/trace-mapping': 0.3.21 - commander: 4.1.1 + '@babel/core': 7.26.0 + '@jridgewell/trace-mapping': 0.3.25 + commander: 6.2.1 convert-source-map: 2.0.0 fs-readdir-recursive: 1.1.0 glob: 7.2.3 @@ -2098,26 +2098,39 @@ packages: '@babel/highlight': 7.23.4 chalk: 2.4.2 + /@babel/code-frame@7.26.2: + resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-validator-identifier': 7.25.9 + js-tokens: 4.0.0 + picocolors: 1.1.1 + /@babel/compat-data@7.23.5: resolution: {integrity: sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==} engines: {node: '>=6.9.0'} + dev: true + + /@babel/compat-data@7.26.2: + resolution: {integrity: sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==} + engines: {node: '>=6.9.0'} - /@babel/core@7.23.7: - resolution: {integrity: sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==} + /@babel/core@7.26.0: + resolution: {integrity: sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==} engines: {node: '>=6.9.0'} dependencies: '@ampproject/remapping': 2.2.1 - '@babel/code-frame': 7.23.5 - '@babel/generator': 7.23.6 - '@babel/helper-compilation-targets': 7.23.6 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.7) - '@babel/helpers': 7.23.8 - '@babel/parser': 7.23.6 - '@babel/template': 7.22.15 - '@babel/traverse': 7.23.7 - '@babel/types': 7.23.6 + '@babel/code-frame': 7.26.2 + '@babel/generator': 7.26.2 + '@babel/helper-compilation-targets': 7.25.9 + '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0) + '@babel/helpers': 7.26.0 + '@babel/parser': 7.26.2 + '@babel/template': 7.25.9 + '@babel/traverse': 7.25.9 + '@babel/types': 7.26.0 convert-source-map: 2.0.0 - debug: 4.3.4 + debug: 4.3.7(supports-color@9.4.0) gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 @@ -2129,9 +2142,20 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.23.6 - '@jridgewell/gen-mapping': 0.3.3 + '@jridgewell/gen-mapping': 0.3.5 '@jridgewell/trace-mapping': 0.3.25 jsesc: 2.5.2 + dev: true + + /@babel/generator@7.26.2: + resolution: {integrity: sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/parser': 7.26.2 + '@babel/types': 7.26.0 + '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/trace-mapping': 0.3.25 + jsesc: 3.0.2 /@babel/helper-annotate-as-pure@7.22.5: resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==} @@ -2156,43 +2180,54 @@ packages: browserslist: 4.24.2 lru-cache: 5.1.1 semver: 6.3.1 + dev: true - /@babel/helper-create-class-features-plugin@7.23.7(@babel/core@7.23.7): + /@babel/helper-compilation-targets@7.25.9: + resolution: {integrity: sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/compat-data': 7.26.2 + '@babel/helper-validator-option': 7.25.9 + browserslist: 4.24.2 + lru-cache: 5.1.1 + semver: 6.3.1 + + /@babel/helper-create-class-features-plugin@7.23.7(@babel/core@7.26.0): resolution: {integrity: sha512-xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-function-name': 7.23.0 '@babel/helper-member-expression-to-functions': 7.23.0 '@babel/helper-optimise-call-expression': 7.22.5 - '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.7) + '@babel/helper-replace-supers': 7.22.20(@babel/core@7.26.0) '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 semver: 6.3.1 dev: true - /@babel/helper-create-regexp-features-plugin@7.22.15(@babel/core@7.23.7): + /@babel/helper-create-regexp-features-plugin@7.22.15(@babel/core@7.26.0): resolution: {integrity: sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-annotate-as-pure': 7.22.5 regexpu-core: 5.3.2 semver: 6.3.1 dev: true - /@babel/helper-define-polyfill-provider@0.4.4(@babel/core@7.23.7): + /@babel/helper-define-polyfill-provider@0.4.4(@babel/core@7.26.0): resolution: {integrity: sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA==} peerDependencies: '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-compilation-targets': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 debug: 4.3.7(supports-color@9.4.0) @@ -2205,6 +2240,7 @@ packages: /@babel/helper-environment-visitor@7.22.20: resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==} engines: {node: '>=6.9.0'} + dev: true /@babel/helper-function-name@7.23.0: resolution: {integrity: sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==} @@ -2212,12 +2248,14 @@ packages: dependencies: '@babel/template': 7.22.15 '@babel/types': 7.23.6 + dev: true /@babel/helper-hoist-variables@7.22.5: resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==} engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.23.6 + dev: true /@babel/helper-member-expression-to-functions@7.23.0: resolution: {integrity: sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==} @@ -2232,18 +2270,41 @@ packages: dependencies: '@babel/types': 7.23.6 - /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.7): + /@babel/helper-module-imports@7.25.9: + resolution: {integrity: sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/traverse': 7.25.9 + '@babel/types': 7.26.0 + transitivePeerDependencies: + - supports-color + + /@babel/helper-module-transforms@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-module-imports': 7.22.15 '@babel/helper-simple-access': 7.22.5 '@babel/helper-split-export-declaration': 7.22.6 '@babel/helper-validator-identifier': 7.22.20 + dev: true + + /@babel/helper-module-transforms@7.26.0(@babel/core@7.26.0): + resolution: {integrity: sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.26.0 + '@babel/helper-module-imports': 7.25.9 + '@babel/helper-validator-identifier': 7.25.9 + '@babel/traverse': 7.25.9 + transitivePeerDependencies: + - supports-color /@babel/helper-optimise-call-expression@7.22.5: resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==} @@ -2257,25 +2318,25 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/helper-remap-async-to-generator@7.22.20(@babel/core@7.23.7): + /@babel/helper-remap-async-to-generator@7.22.20(@babel/core@7.26.0): resolution: {integrity: sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-wrap-function': 7.22.20 dev: true - /@babel/helper-replace-supers@7.22.20(@babel/core@7.23.7): + /@babel/helper-replace-supers@7.22.20(@babel/core@7.26.0): resolution: {integrity: sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-member-expression-to-functions': 7.23.0 '@babel/helper-optimise-call-expression': 7.22.5 @@ -2286,6 +2347,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.23.6 + dev: true /@babel/helper-skip-transparent-expression-wrappers@7.22.5: resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==} @@ -2299,18 +2361,32 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/types': 7.23.6 + dev: true /@babel/helper-string-parser@7.23.4: resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==} engines: {node: '>=6.9.0'} + /@babel/helper-string-parser@7.25.9: + resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==} + engines: {node: '>=6.9.0'} + /@babel/helper-validator-identifier@7.22.20: resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==} engines: {node: '>=6.9.0'} + /@babel/helper-validator-identifier@7.25.9: + resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==} + engines: {node: '>=6.9.0'} + /@babel/helper-validator-option@7.23.5: resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==} engines: {node: '>=6.9.0'} + dev: true + + /@babel/helper-validator-option@7.25.9: + resolution: {integrity: sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==} + engines: {node: '>=6.9.0'} /@babel/helper-wrap-function@7.22.20: resolution: {integrity: sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==} @@ -2321,15 +2397,12 @@ packages: '@babel/types': 7.23.6 dev: true - /@babel/helpers@7.23.8: - resolution: {integrity: sha512-KDqYz4PiOWvDFrdHLPhKtCThtIcKVy6avWD2oG4GEvyQ+XDZwHD4YQd+H2vNMnq2rkdxsDkU82T+Vk8U/WXHRQ==} + /@babel/helpers@7.26.0: + resolution: {integrity: sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/template': 7.22.15 - '@babel/traverse': 7.23.7 - '@babel/types': 7.23.6 - transitivePeerDependencies: - - supports-color + '@babel/template': 7.25.9 + '@babel/types': 7.26.0 /@babel/highlight@7.23.4: resolution: {integrity: sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==} @@ -2345,89 +2418,97 @@ packages: hasBin: true dependencies: '@babel/types': 7.23.6 + dev: true - /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.23.3(@babel/core@7.23.7): + /@babel/parser@7.26.2: + resolution: {integrity: sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==} + engines: {node: '>=6.0.0'} + hasBin: true + dependencies: + '@babel/types': 7.26.0 + + /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.23.3(@babel/core@7.23.7): + /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.13.0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 - '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.23.7) + '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.26.0) dev: true - /@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.23.7(@babel/core@7.23.7): + /@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.23.7(@babel/core@7.26.0): resolution: {integrity: sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.23.7): + /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.26.0): resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==} engines: {node: '>=6.9.0'} deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead. peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 - '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.26.0) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-proposal-decorators@7.23.7(@babel/core@7.23.7): + /@babel/plugin-proposal-decorators@7.23.7(@babel/core@7.26.0): resolution: {integrity: sha512-b1s5JyeMvqj7d9m9KhJNHKc18gEJiSyVzVX3bwbiPalQBQpuvfPh6lA9F7Kk/dWH0TIiXRpB9yicwijY6buPng==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 - '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.26.0) '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-decorators': 7.23.3(@babel/core@7.23.7) + '@babel/plugin-syntax-decorators': 7.23.3(@babel/core@7.26.0) dev: true - /@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.23.7): + /@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.26.0): resolution: {integrity: sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==} engines: {node: '>=6.9.0'} deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead. peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.7) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.26.0) dev: true - /@babel/plugin-proposal-numeric-separator@7.18.6(@babel/core@7.23.7): + /@babel/plugin-proposal-numeric-separator@7.18.6(@babel/core@7.26.0): resolution: {integrity: sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==} engines: {node: '>=6.9.0'} deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-numeric-separator instead. peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.7) + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.26.0) dev: true - /@babel/plugin-proposal-object-rest-spread@7.20.7(@babel/core@7.23.7): + /@babel/plugin-proposal-object-rest-spread@7.20.7(@babel/core@7.26.0): resolution: {integrity: sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==} engines: {node: '>=6.9.0'} deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead. @@ -2435,1026 +2516,1026 @@ packages: '@babel/core': ^7.0.0-0 dependencies: '@babel/compat-data': 7.23.5 - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-compilation-targets': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.7) - '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.23.7) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.26.0) dev: true - /@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.23.7): + /@babel/plugin-proposal-optional-chaining@7.21.0(@babel/core@7.26.0): resolution: {integrity: sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==} engines: {node: '>=6.9.0'} deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead. peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.7) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.26.0) dev: true - /@babel/plugin-proposal-private-methods@7.18.6(@babel/core@7.23.7): + /@babel/plugin-proposal-private-methods@7.18.6(@babel/core@7.26.0): resolution: {integrity: sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==} engines: {node: '>=6.9.0'} deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-methods instead. peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 - '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.26.0) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.7): + /@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.0): resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 dev: true - /@babel/plugin-proposal-private-property-in-object@7.21.11(@babel/core@7.23.7): + /@babel/plugin-proposal-private-property-in-object@7.21.11(@babel/core@7.26.0): resolution: {integrity: sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==} engines: {node: '>=6.9.0'} deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead. peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.23.7) + '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.26.0) '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.7) + '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.26.0) dev: true - /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.23.7): + /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.26.0): resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.23.7): + /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.26.0): resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.23.7): + /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.26.0): resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.23.7): + /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.26.0): resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-decorators@7.23.3(@babel/core@7.23.7): + /@babel/plugin-syntax-decorators@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-cf7Niq4/+/juY67E0PbgH0TDhLQ5J7zS8C/Q5FFx+DWyrRa9sUQdTXkjqKu8zGvuqr7vw1muKiukseihU+PJDA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.23.7): + /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.26.0): resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.23.7): + /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.26.0): resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-flow@7.23.3(@babel/core@7.23.7): + /@babel/plugin-syntax-flow@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-YZiAIpkJAwQXBJLIQbRFayR5c+gJ35Vcz3bg954k7cd73zqjvhacJuL9RbrzPz8qPmZdgqP6EUKwy0PCNhaaPA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-import-assertions@7.23.3(@babel/core@7.23.7): + /@babel/plugin-syntax-import-assertions@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-import-attributes@7.23.3(@babel/core@7.23.7): + /@babel/plugin-syntax-import-attributes@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.23.7): + /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.26.0): resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.23.7): + /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.26.0): resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.23.7): + /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.23.7): + /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.26.0): resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.23.7): + /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.26.0): resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.23.7): + /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.26.0): resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.23.7): + /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.26.0): resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.23.7): + /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.26.0): resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.23.7): + /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.26.0): resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.23.7): + /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.26.0): resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.23.7): + /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.26.0): resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-typescript@7.23.3(@babel/core@7.23.7): + /@babel/plugin-syntax-typescript@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.23.7): + /@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.26.0): resolution: {integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.7 - '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.26.0) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-arrow-functions@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-arrow-functions@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-async-generator-functions@7.23.7(@babel/core@7.23.7): + /@babel/plugin-transform-async-generator-functions@7.23.7(@babel/core@7.26.0): resolution: {integrity: sha512-PdxEpL71bJp1byMG0va5gwQcXHxuEYC/BgI/e88mGTtohbZN28O5Yit0Plkkm/dBzCF/BxmbNcses1RH1T+urA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.23.7) - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.7) + '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.26.0) + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.26.0) dev: true - /@babel/plugin-transform-async-to-generator@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-async-to-generator@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-module-imports': 7.22.15 '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.23.7) + '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.26.0) dev: true - /@babel/plugin-transform-block-scoped-functions@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-block-scoped-functions@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-block-scoping@7.23.4(@babel/core@7.23.7): + /@babel/plugin-transform-block-scoping@7.23.4(@babel/core@7.26.0): resolution: {integrity: sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-class-properties@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-class-properties@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 - '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.26.0) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-class-static-block@7.23.4(@babel/core@7.23.7): + /@babel/plugin-transform-class-static-block@7.23.4(@babel/core@7.26.0): resolution: {integrity: sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.12.0 dependencies: - '@babel/core': 7.23.7 - '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.26.0) '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.7) + '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.26.0) dev: true - /@babel/plugin-transform-classes@7.23.8(@babel/core@7.23.7): + /@babel/plugin-transform-classes@7.23.8(@babel/core@7.26.0): resolution: {integrity: sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-compilation-targets': 7.23.6 '@babel/helper-environment-visitor': 7.22.20 '@babel/helper-function-name': 7.23.0 '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.7) + '@babel/helper-replace-supers': 7.22.20(@babel/core@7.26.0) '@babel/helper-split-export-declaration': 7.22.6 globals: 11.12.0 dev: true - /@babel/plugin-transform-computed-properties@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-computed-properties@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 '@babel/template': 7.22.15 dev: true - /@babel/plugin-transform-destructuring@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-destructuring@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-dotall-regex@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-dotall-regex@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 - '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.26.0) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-duplicate-keys@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-duplicate-keys@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-dynamic-import@7.23.4(@babel/core@7.23.7): + /@babel/plugin-transform-dynamic-import@7.23.4(@babel/core@7.26.0): resolution: {integrity: sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.7) + '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.26.0) dev: true - /@babel/plugin-transform-exponentiation-operator@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-exponentiation-operator@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-builder-binary-assignment-operator-visitor': 7.22.15 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-export-namespace-from@7.23.4(@babel/core@7.23.7): + /@babel/plugin-transform-export-namespace-from@7.23.4(@babel/core@7.26.0): resolution: {integrity: sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.23.7) + '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.26.0) dev: true - /@babel/plugin-transform-flow-strip-types@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-flow-strip-types@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-26/pQTf9nQSNVJCrLB1IkHUKyPxR+lMrH2QDPG89+Znu9rAMbtrybdbWeE9bb7gzjmE5iXHEY+e0HUwM6Co93Q==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-flow': 7.23.3(@babel/core@7.23.7) + '@babel/plugin-syntax-flow': 7.23.3(@babel/core@7.26.0) dev: true - /@babel/plugin-transform-for-of@7.23.6(@babel/core@7.23.7): + /@babel/plugin-transform-for-of@7.23.6(@babel/core@7.26.0): resolution: {integrity: sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 dev: true - /@babel/plugin-transform-function-name@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-function-name@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-compilation-targets': 7.23.6 '@babel/helper-function-name': 7.23.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-json-strings@7.23.4(@babel/core@7.23.7): + /@babel/plugin-transform-json-strings@7.23.4(@babel/core@7.26.0): resolution: {integrity: sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.7) + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.26.0) dev: true - /@babel/plugin-transform-literals@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-literals@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-logical-assignment-operators@7.23.4(@babel/core@7.23.7): + /@babel/plugin-transform-logical-assignment-operators@7.23.4(@babel/core@7.26.0): resolution: {integrity: sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.7) + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.26.0) dev: true - /@babel/plugin-transform-member-expression-literals@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-member-expression-literals@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-modules-amd@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-modules-amd@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/helper-module-transforms': 7.23.3(@babel/core@7.26.0) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-modules-commonjs@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-modules-commonjs@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/helper-module-transforms': 7.23.3(@babel/core@7.26.0) '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-simple-access': 7.22.5 dev: true - /@babel/plugin-transform-modules-systemjs@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-modules-systemjs@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-hoist-variables': 7.22.5 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.7) + '@babel/helper-module-transforms': 7.23.3(@babel/core@7.26.0) '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-validator-identifier': 7.22.20 dev: true - /@babel/plugin-transform-modules-umd@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-modules-umd@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/helper-module-transforms': 7.23.3(@babel/core@7.26.0) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.23.7): + /@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.26.0): resolution: {integrity: sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.7 - '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.26.0) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-new-target@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-new-target@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-nullish-coalescing-operator@7.23.4(@babel/core@7.23.7): + /@babel/plugin-transform-nullish-coalescing-operator@7.23.4(@babel/core@7.26.0): resolution: {integrity: sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.7) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.26.0) dev: true - /@babel/plugin-transform-numeric-separator@7.23.4(@babel/core@7.23.7): + /@babel/plugin-transform-numeric-separator@7.23.4(@babel/core@7.26.0): resolution: {integrity: sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.7) + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.26.0) dev: true - /@babel/plugin-transform-object-rest-spread@7.23.4(@babel/core@7.23.7): + /@babel/plugin-transform-object-rest-spread@7.23.4(@babel/core@7.26.0): resolution: {integrity: sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: '@babel/compat-data': 7.23.5 - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-compilation-targets': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.7) - '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.23.7) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.26.0) dev: true - /@babel/plugin-transform-object-super@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-object-super@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.7) + '@babel/helper-replace-supers': 7.22.20(@babel/core@7.26.0) dev: true - /@babel/plugin-transform-optional-catch-binding@7.23.4(@babel/core@7.23.7): + /@babel/plugin-transform-optional-catch-binding@7.23.4(@babel/core@7.26.0): resolution: {integrity: sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.7) + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.26.0) dev: true - /@babel/plugin-transform-optional-chaining@7.23.4(@babel/core@7.23.7): + /@babel/plugin-transform-optional-chaining@7.23.4(@babel/core@7.26.0): resolution: {integrity: sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.7) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.26.0) dev: true - /@babel/plugin-transform-parameters@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-parameters@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-private-methods@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-private-methods@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 - '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.26.0) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-private-property-in-object@7.23.4(@babel/core@7.23.7): + /@babel/plugin-transform-private-property-in-object@7.23.4(@babel/core@7.26.0): resolution: {integrity: sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.23.7) + '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.26.0) '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.7) + '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.26.0) dev: true - /@babel/plugin-transform-property-literals@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-property-literals@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-react-display-name@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-react-display-name@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-react-jsx-development@7.22.5(@babel/core@7.23.7): + /@babel/plugin-transform-react-jsx-development@7.22.5(@babel/core@7.26.0): resolution: {integrity: sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 - '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.26.0) dev: true - /@babel/plugin-transform-react-jsx@7.23.4(@babel/core@7.23.7): + /@babel/plugin-transform-react-jsx@7.23.4(@babel/core@7.26.0): resolution: {integrity: sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-module-imports': 7.22.15 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.7) + '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.26.0) '@babel/types': 7.23.6 dev: true - /@babel/plugin-transform-react-pure-annotations@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-react-pure-annotations@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-qMFdSS+TUhB7Q/3HVPnEdYJDQIk57jkntAwSuz9xfSE4n+3I+vHYCli3HoHawN1Z3RfCz/y1zXA/JXjG6cVImQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-regenerator@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-regenerator@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 regenerator-transform: 0.15.2 dev: true - /@babel/plugin-transform-reserved-words@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-reserved-words@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-runtime@7.23.7(@babel/core@7.23.7): + /@babel/plugin-transform-runtime@7.23.7(@babel/core@7.26.0): resolution: {integrity: sha512-fa0hnfmiXc9fq/weK34MUV0drz2pOL/vfKWvN7Qw127hiUPabFCUMgAbYWcchRzMJit4o5ARsK/s+5h0249pLw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-module-imports': 7.22.15 '@babel/helper-plugin-utils': 7.22.5 - babel-plugin-polyfill-corejs2: 0.4.7(@babel/core@7.23.7) - babel-plugin-polyfill-corejs3: 0.8.7(@babel/core@7.23.7) - babel-plugin-polyfill-regenerator: 0.5.4(@babel/core@7.23.7) + babel-plugin-polyfill-corejs2: 0.4.7(@babel/core@7.26.0) + babel-plugin-polyfill-corejs3: 0.8.7(@babel/core@7.26.0) + babel-plugin-polyfill-regenerator: 0.5.4(@babel/core@7.26.0) semver: 6.3.1 transitivePeerDependencies: - supports-color dev: true - /@babel/plugin-transform-shorthand-properties@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-shorthand-properties@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-spread@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-spread@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 dev: true - /@babel/plugin-transform-sticky-regex@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-sticky-regex@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-template-literals@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-template-literals@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-typeof-symbol@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-typeof-symbol@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-typescript@7.23.6(@babel/core@7.23.7): + /@babel/plugin-transform-typescript@7.23.6(@babel/core@7.26.0): resolution: {integrity: sha512-6cBG5mBvUu4VUD04OHKnYzbuHNP8huDsD3EDqqpIpsswTDoqHCjLoHb6+QgsV1WsT2nipRqCPgxD3LXnEO7XfA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.23.7) + '@babel/helper-create-class-features-plugin': 7.23.7(@babel/core@7.26.0) '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.23.7) + '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.26.0) dev: true - /@babel/plugin-transform-unicode-escapes@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-unicode-escapes@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-unicode-property-regex@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-unicode-property-regex@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 - '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.26.0) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-unicode-regex@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-unicode-regex@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 - '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.26.0) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-unicode-sets-regex@7.23.3(@babel/core@7.23.7): + /@babel/plugin-transform-unicode-sets-regex@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.7 - '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.26.0) '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/preset-env@7.23.8(@babel/core@7.23.7): + /@babel/preset-env@7.23.8(@babel/core@7.26.0): resolution: {integrity: sha512-lFlpmkApLkEP6woIKprO6DO60RImpatTQKtz4sUcDjVcK8M8mQ4sZsuxaTMNOZf0sqAq/ReYW1ZBHnOQwKpLWA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: '@babel/compat-data': 7.23.5 - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-compilation-targets': 7.23.6 '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-validator-option': 7.23.5 - '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.23.7(@babel/core@7.23.7) - '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.7) - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.7) - '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.23.7) - '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.7) - '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.7) - '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.23.7) - '@babel/plugin-syntax-import-assertions': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-syntax-import-attributes': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.23.7) - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.7) - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.7) - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.7) - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.7) - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.7) - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.7) - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.7) - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.7) - '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.23.7) - '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.23.7) - '@babel/plugin-transform-arrow-functions': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-async-generator-functions': 7.23.7(@babel/core@7.23.7) - '@babel/plugin-transform-async-to-generator': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-block-scoped-functions': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.23.7) - '@babel/plugin-transform-class-properties': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-class-static-block': 7.23.4(@babel/core@7.23.7) - '@babel/plugin-transform-classes': 7.23.8(@babel/core@7.23.7) - '@babel/plugin-transform-computed-properties': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-destructuring': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-dotall-regex': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-duplicate-keys': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-dynamic-import': 7.23.4(@babel/core@7.23.7) - '@babel/plugin-transform-exponentiation-operator': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-export-namespace-from': 7.23.4(@babel/core@7.23.7) - '@babel/plugin-transform-for-of': 7.23.6(@babel/core@7.23.7) - '@babel/plugin-transform-function-name': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-json-strings': 7.23.4(@babel/core@7.23.7) - '@babel/plugin-transform-literals': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-logical-assignment-operators': 7.23.4(@babel/core@7.23.7) - '@babel/plugin-transform-member-expression-literals': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-modules-amd': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-modules-systemjs': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-modules-umd': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.23.7) - '@babel/plugin-transform-new-target': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-nullish-coalescing-operator': 7.23.4(@babel/core@7.23.7) - '@babel/plugin-transform-numeric-separator': 7.23.4(@babel/core@7.23.7) - '@babel/plugin-transform-object-rest-spread': 7.23.4(@babel/core@7.23.7) - '@babel/plugin-transform-object-super': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-optional-catch-binding': 7.23.4(@babel/core@7.23.7) - '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.23.7) - '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-private-methods': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-private-property-in-object': 7.23.4(@babel/core@7.23.7) - '@babel/plugin-transform-property-literals': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-regenerator': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-reserved-words': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-shorthand-properties': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-spread': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-sticky-regex': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-template-literals': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-typeof-symbol': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-unicode-escapes': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-unicode-property-regex': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-unicode-regex': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-unicode-sets-regex': 7.23.3(@babel/core@7.23.7) - '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.23.7) - babel-plugin-polyfill-corejs2: 0.4.7(@babel/core@7.23.7) - babel-plugin-polyfill-corejs3: 0.8.7(@babel/core@7.23.7) - babel-plugin-polyfill-regenerator: 0.5.4(@babel/core@7.23.7) + '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.23.7(@babel/core@7.26.0) + '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.0) + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.26.0) + '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.26.0) + '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.26.0) + '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-import-assertions': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-syntax-import-attributes': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.26.0) + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.26.0) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.26.0) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.26.0) + '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.26.0) + '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.26.0) + '@babel/plugin-transform-arrow-functions': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-async-generator-functions': 7.23.7(@babel/core@7.26.0) + '@babel/plugin-transform-async-to-generator': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-block-scoped-functions': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.26.0) + '@babel/plugin-transform-class-properties': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-class-static-block': 7.23.4(@babel/core@7.26.0) + '@babel/plugin-transform-classes': 7.23.8(@babel/core@7.26.0) + '@babel/plugin-transform-computed-properties': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-destructuring': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-dotall-regex': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-duplicate-keys': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-dynamic-import': 7.23.4(@babel/core@7.26.0) + '@babel/plugin-transform-exponentiation-operator': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-export-namespace-from': 7.23.4(@babel/core@7.26.0) + '@babel/plugin-transform-for-of': 7.23.6(@babel/core@7.26.0) + '@babel/plugin-transform-function-name': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-json-strings': 7.23.4(@babel/core@7.26.0) + '@babel/plugin-transform-literals': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-logical-assignment-operators': 7.23.4(@babel/core@7.26.0) + '@babel/plugin-transform-member-expression-literals': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-modules-amd': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-modules-systemjs': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-modules-umd': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.26.0) + '@babel/plugin-transform-new-target': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-nullish-coalescing-operator': 7.23.4(@babel/core@7.26.0) + '@babel/plugin-transform-numeric-separator': 7.23.4(@babel/core@7.26.0) + '@babel/plugin-transform-object-rest-spread': 7.23.4(@babel/core@7.26.0) + '@babel/plugin-transform-object-super': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-optional-catch-binding': 7.23.4(@babel/core@7.26.0) + '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.26.0) + '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-private-methods': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-private-property-in-object': 7.23.4(@babel/core@7.26.0) + '@babel/plugin-transform-property-literals': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-regenerator': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-reserved-words': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-shorthand-properties': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-spread': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-sticky-regex': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-template-literals': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-typeof-symbol': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-unicode-escapes': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-unicode-property-regex': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-unicode-regex': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-unicode-sets-regex': 7.23.3(@babel/core@7.26.0) + '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.26.0) + babel-plugin-polyfill-corejs2: 0.4.7(@babel/core@7.26.0) + babel-plugin-polyfill-corejs3: 0.8.7(@babel/core@7.26.0) + babel-plugin-polyfill-regenerator: 0.5.4(@babel/core@7.26.0) core-js-compat: 3.35.0 semver: 6.3.1 transitivePeerDependencies: - supports-color dev: true - /@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.23.7): + /@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.26.0): resolution: {integrity: sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==} peerDependencies: '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 '@babel/types': 7.23.6 esutils: 2.0.3 dev: true - /@babel/preset-react@7.23.3(@babel/core@7.23.7): + /@babel/preset-react@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-tbkHOS9axH6Ysf2OUEqoSZ6T3Fa2SrNH6WTWSPBboxKzdxNc9qOICeLXkNG0ZEwbQ1HY8liwOce4aN/Ceyuq6w==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-validator-option': 7.23.5 - '@babel/plugin-transform-react-display-name': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.23.7) - '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.23.7) - '@babel/plugin-transform-react-pure-annotations': 7.23.3(@babel/core@7.23.7) + '@babel/plugin-transform-react-display-name': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.26.0) + '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.26.0) + '@babel/plugin-transform-react-pure-annotations': 7.23.3(@babel/core@7.26.0) dev: true - /@babel/preset-typescript@7.23.3(@babel/core@7.23.7): + /@babel/preset-typescript@7.23.3(@babel/core@7.26.0): resolution: {integrity: sha512-17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-validator-option': 7.23.5 - '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-typescript': 7.23.6(@babel/core@7.23.7) + '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-typescript': 7.23.6(@babel/core@7.26.0) dev: true /@babel/regjsgen@0.8.0: @@ -3480,6 +3561,15 @@ packages: '@babel/code-frame': 7.23.5 '@babel/parser': 7.23.6 '@babel/types': 7.23.6 + dev: true + + /@babel/template@7.25.9: + resolution: {integrity: sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.26.2 + '@babel/parser': 7.26.2 + '@babel/types': 7.26.0 /@babel/traverse@7.23.7: resolution: {integrity: sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==} @@ -3497,6 +3587,21 @@ packages: globals: 11.12.0 transitivePeerDependencies: - supports-color + dev: true + + /@babel/traverse@7.25.9: + resolution: {integrity: sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.26.2 + '@babel/generator': 7.26.2 + '@babel/parser': 7.26.2 + '@babel/template': 7.25.9 + '@babel/types': 7.26.0 + debug: 4.3.7(supports-color@9.4.0) + globals: 11.12.0 + transitivePeerDependencies: + - supports-color /@babel/types@7.23.6: resolution: {integrity: sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==} @@ -3506,6 +3611,13 @@ packages: '@babel/helper-validator-identifier': 7.22.20 to-fast-properties: 2.0.0 + /@babel/types@7.26.0: + resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-string-parser': 7.25.9 + '@babel/helper-validator-identifier': 7.25.9 + /@bcoe/v8-coverage@0.2.3: resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} dev: true @@ -3703,17 +3815,17 @@ packages: dev: true optional: true - /@comet/admin-babel-preset@7.7.0(@babel/cli@7.23.4): + /@comet/admin-babel-preset@7.7.0(@babel/cli@7.25.9): resolution: {integrity: sha512-rap123hBI/Q3Q65S3kMpQw9CJOppoCUwYM7/6CJsvxkFFybpOpOnFgjAudUYKw8FBXiq6bsNqkQhlqhuOO1L0g==} peerDependencies: '@babel/cli': '>= 7' dependencies: - '@babel/cli': 7.23.4(@babel/core@7.23.7) - '@babel/core': 7.23.7 - '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.23.7) - '@babel/preset-env': 7.23.8(@babel/core@7.23.7) - '@babel/preset-react': 7.23.3(@babel/core@7.23.7) - '@babel/preset-typescript': 7.23.3(@babel/core@7.23.7) + '@babel/cli': 7.25.9(@babel/core@7.26.0) + '@babel/core': 7.26.0 + '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.26.0) + '@babel/preset-env': 7.23.8(@babel/core@7.26.0) + '@babel/preset-react': 7.23.3(@babel/core@7.26.0) + '@babel/preset-typescript': 7.23.3(@babel/core@7.26.0) '@emotion/babel-plugin': 11.11.0 transitivePeerDependencies: - supports-color @@ -4140,7 +4252,7 @@ packages: dependencies: '@types/react': 18.3.12 jose: 5.9.6 - next: 14.2.18(@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.18(@babel/core@7.26.0)(@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 @@ -4197,7 +4309,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.18(@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.18(@babel/core@7.26.0)(@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: @@ -4792,7 +4904,7 @@ packages: tslib: 2.4.1 dev: true - /@graphql-codegen/cli@2.16.5(@babel/core@7.23.7)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5): + /@graphql-codegen/cli@2.16.5(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5): resolution: {integrity: sha512-XYPIp+q7fB0xAGSAoRykiTe4oY80VU+z+dw5nuv4mLY0+pv7+pa2C6Nwhdw7a65lXOhFviBApWCCZeqd54SMnA==} hasBin: true peerDependencies: @@ -4804,9 +4916,9 @@ packages: '@graphql-codegen/core': 2.6.8(graphql@15.8.0) '@graphql-codegen/plugin-helpers': 3.1.2(graphql@15.8.0) '@graphql-tools/apollo-engine-loader': 7.3.26(graphql@15.8.0) - '@graphql-tools/code-file-loader': 7.3.23(@babel/core@7.23.7)(graphql@15.8.0) - '@graphql-tools/git-loader': 7.3.0(@babel/core@7.23.7)(graphql@15.8.0) - '@graphql-tools/github-loader': 7.3.28(@babel/core@7.23.7)(@types/node@18.19.8)(graphql@15.8.0) + '@graphql-tools/code-file-loader': 7.3.23(@babel/core@7.26.0)(graphql@15.8.0) + '@graphql-tools/git-loader': 7.3.0(@babel/core@7.26.0)(graphql@15.8.0) + '@graphql-tools/github-loader': 7.3.28(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.8.0) '@graphql-tools/graphql-file-loader': 7.5.17(graphql@15.8.0) '@graphql-tools/json-file-loader': 7.4.18(graphql@15.8.0) '@graphql-tools/load': 7.8.14(graphql@15.8.0) @@ -5066,12 +5178,12 @@ packages: value-or-promise: 1.0.12 dev: true - /@graphql-tools/code-file-loader@7.3.23(@babel/core@7.23.7)(graphql@15.8.0): + /@graphql-tools/code-file-loader@7.3.23(@babel/core@7.26.0)(graphql@15.8.0): resolution: {integrity: sha512-8Wt1rTtyTEs0p47uzsPJ1vAtfAx0jmxPifiNdmo9EOCuUPyQGEbMaik/YkqZ7QUFIEYEQu+Vgfo8tElwOPtx5Q==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/graphql-tag-pluck': 7.5.2(@babel/core@7.23.7)(graphql@15.8.0) + '@graphql-tools/graphql-tag-pluck': 7.5.2(@babel/core@7.26.0)(graphql@15.8.0) '@graphql-tools/utils': 9.2.1(graphql@15.8.0) globby: 11.1.0 graphql: 15.8.0 @@ -5162,12 +5274,12 @@ packages: value-or-promise: 1.0.12 dev: true - /@graphql-tools/git-loader@7.3.0(@babel/core@7.23.7)(graphql@15.8.0): + /@graphql-tools/git-loader@7.3.0(@babel/core@7.26.0)(graphql@15.8.0): resolution: {integrity: sha512-gcGAK+u16eHkwsMYqqghZbmDquh8QaO24Scsxq+cVR+vx1ekRlsEiXvu+yXVDbZdcJ6PBIbeLcQbEu+xhDLmvQ==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/graphql-tag-pluck': 7.5.2(@babel/core@7.23.7)(graphql@15.8.0) + '@graphql-tools/graphql-tag-pluck': 7.5.2(@babel/core@7.26.0)(graphql@15.8.0) '@graphql-tools/utils': 9.2.1(graphql@15.8.0) graphql: 15.8.0 is-glob: 4.0.3 @@ -5179,14 +5291,14 @@ packages: - supports-color dev: true - /@graphql-tools/github-loader@7.3.28(@babel/core@7.23.7)(@types/node@18.19.8)(graphql@15.8.0): + /@graphql-tools/github-loader@7.3.28(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.8.0): resolution: {integrity: sha512-OK92Lf9pmxPQvjUNv05b3tnVhw0JRfPqOf15jZjyQ8BfdEUrJoP32b4dRQQem/wyRL24KY4wOfArJNqzpsbwCA==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: '@ardatan/sync-fetch': 0.0.1 '@graphql-tools/executor-http': 0.1.10(@types/node@18.19.8)(graphql@15.8.0) - '@graphql-tools/graphql-tag-pluck': 7.5.2(@babel/core@7.23.7)(graphql@15.8.0) + '@graphql-tools/graphql-tag-pluck': 7.5.2(@babel/core@7.26.0)(graphql@15.8.0) '@graphql-tools/utils': 9.2.1(graphql@15.8.0) '@whatwg-node/fetch': 0.8.8 graphql: 15.8.0 @@ -5211,13 +5323,13 @@ packages: tslib: 2.8.1 unixify: 1.0.0 - /@graphql-tools/graphql-tag-pluck@7.5.2(@babel/core@7.23.7)(graphql@15.8.0): + /@graphql-tools/graphql-tag-pluck@7.5.2(@babel/core@7.26.0)(graphql@15.8.0): resolution: {integrity: sha512-RW+H8FqOOLQw0BPXaahYepVSRjuOHw+7IL8Opaa5G5uYGOBxoXR7DceyQ7BcpMgktAOOmpDNQ2WtcboChOJSRA==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: '@babel/parser': 7.23.6 - '@babel/plugin-syntax-import-assertions': 7.23.3(@babel/core@7.23.7) + '@babel/plugin-syntax-import-assertions': 7.23.3(@babel/core@7.26.0) '@babel/traverse': 7.23.7 '@babel/types': 7.23.6 '@graphql-tools/utils': 9.2.1(graphql@15.8.0) @@ -5955,7 +6067,7 @@ packages: resolution: {integrity: sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@jest/types': 27.5.1 babel-plugin-istanbul: 6.1.1 chalk: 4.1.2 @@ -5978,7 +6090,7 @@ packages: resolution: {integrity: sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@jest/types': 29.6.3 '@jridgewell/trace-mapping': 0.3.25 babel-plugin-istanbul: 6.1.1 @@ -6024,14 +6136,6 @@ packages: resolution: {integrity: sha512-CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg==} dev: false - /@jridgewell/gen-mapping@0.3.3: - resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==} - engines: {node: '>=6.0.0'} - dependencies: - '@jridgewell/set-array': 1.2.1 - '@jridgewell/sourcemap-codec': 1.5.0 - '@jridgewell/trace-mapping': 0.3.25 - /@jridgewell/gen-mapping@0.3.5: resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} engines: {node: '>=6.0.0'} @@ -6057,13 +6161,6 @@ packages: /@jridgewell/sourcemap-codec@1.5.0: resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} - /@jridgewell/trace-mapping@0.3.21: - resolution: {integrity: sha512-SRfKmRe1KvYnxjEMtxEr+J4HIeMX5YBg/qhRHpxEIGjhX1rshcHlnFUE9K0GazhVKWM7B+nARSkV8LuvJdJ5/g==} - dependencies: - '@jridgewell/resolve-uri': 3.1.2 - '@jridgewell/sourcemap-codec': 1.5.0 - dev: true - /@jridgewell/trace-mapping@0.3.25: resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} dependencies: @@ -10394,18 +10491,18 @@ packages: dequal: 2.0.3 dev: true - /babel-jest@27.5.1(@babel/core@7.23.7): + /babel-jest@27.5.1(@babel/core@7.26.0): resolution: {integrity: sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} peerDependencies: '@babel/core': ^7.8.0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@jest/transform': 27.5.1 '@jest/types': 27.5.1 '@types/babel__core': 7.20.5 babel-plugin-istanbul: 6.1.1 - babel-preset-jest: 27.5.1(@babel/core@7.23.7) + babel-preset-jest: 27.5.1(@babel/core@7.26.0) chalk: 4.1.2 graceful-fs: 4.2.11 slash: 3.0.0 @@ -10413,17 +10510,17 @@ packages: - supports-color dev: true - /babel-jest@29.7.0(@babel/core@7.23.7): + /babel-jest@29.7.0(@babel/core@7.26.0): resolution: {integrity: sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: '@babel/core': ^7.8.0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@jest/transform': 29.7.0 '@types/babel__core': 7.20.5 babel-plugin-istanbul: 6.1.1 - babel-preset-jest: 29.6.3(@babel/core@7.23.7) + babel-preset-jest: 29.6.3(@babel/core@7.26.0) chalk: 4.1.2 graceful-fs: 4.2.11 slash: 3.0.0 @@ -10431,14 +10528,14 @@ packages: - supports-color dev: true - /babel-loader@8.3.0(@babel/core@7.23.7)(webpack@5.94.0): + /babel-loader@8.3.0(@babel/core@7.26.0)(webpack@5.94.0): resolution: {integrity: sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==} engines: {node: '>= 8.9'} peerDependencies: '@babel/core': ^7.0.0 webpack: '>=2' dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 find-cache-dir: 3.3.2 loader-utils: 2.0.4 make-dir: 3.1.0 @@ -10487,38 +10584,38 @@ packages: cosmiconfig: 7.1.0 resolve: 1.22.8 - /babel-plugin-polyfill-corejs2@0.4.7(@babel/core@7.23.7): + /babel-plugin-polyfill-corejs2@0.4.7(@babel/core@7.26.0): resolution: {integrity: sha512-LidDk/tEGDfuHW2DWh/Hgo4rmnw3cduK6ZkOI1NPFceSK3n/yAGeOsNT7FLnSGHkXj3RHGSEVkN3FsCTY6w2CQ==} peerDependencies: '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 dependencies: '@babel/compat-data': 7.23.5 - '@babel/core': 7.23.7 - '@babel/helper-define-polyfill-provider': 0.4.4(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/helper-define-polyfill-provider': 0.4.4(@babel/core@7.26.0) semver: 6.3.1 transitivePeerDependencies: - supports-color dev: true - /babel-plugin-polyfill-corejs3@0.8.7(@babel/core@7.23.7): + /babel-plugin-polyfill-corejs3@0.8.7(@babel/core@7.26.0): resolution: {integrity: sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA==} peerDependencies: '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 dependencies: - '@babel/core': 7.23.7 - '@babel/helper-define-polyfill-provider': 0.4.4(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/helper-define-polyfill-provider': 0.4.4(@babel/core@7.26.0) core-js-compat: 3.35.0 transitivePeerDependencies: - supports-color dev: true - /babel-plugin-polyfill-regenerator@0.5.4(@babel/core@7.23.7): + /babel-plugin-polyfill-regenerator@0.5.4(@babel/core@7.26.0): resolution: {integrity: sha512-S/x2iOCvDaCASLYsOOgWOq4bCfKYVqvO/uxjkaYyZ3rVsVE3CeAI/c84NpyuBBymEgNvHgjEot3a9/Z/kXvqsg==} peerDependencies: '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 dependencies: - '@babel/core': 7.23.7 - '@babel/helper-define-polyfill-provider': 0.4.4(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/helper-define-polyfill-provider': 0.4.4(@babel/core@7.26.0) transitivePeerDependencies: - supports-color dev: true @@ -10531,100 +10628,100 @@ packages: resolution: {integrity: sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==} dev: true - /babel-preset-current-node-syntax@1.0.1(@babel/core@7.23.7): + /babel-preset-current-node-syntax@1.0.1(@babel/core@7.26.0): resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.7 - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.7) - '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.23.7) - '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.23.7) - '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.23.7) - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.7) - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.7) - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.7) - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.7) - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.7) - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.7) - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.7) - '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.23.7) - dev: true - - /babel-preset-fbjs@3.4.0(@babel/core@7.23.7): + '@babel/core': 7.26.0 + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.26.0) + '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.26.0) + '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.26.0) + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.26.0) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.26.0) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.26.0) + dev: true + + /babel-preset-fbjs@3.4.0(@babel/core@7.26.0): resolution: {integrity: sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow==} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.7 - '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.23.7) - '@babel/plugin-proposal-object-rest-spread': 7.20.7(@babel/core@7.23.7) - '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.23.7) - '@babel/plugin-syntax-flow': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.7) - '@babel/plugin-transform-arrow-functions': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-block-scoped-functions': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.23.7) - '@babel/plugin-transform-classes': 7.23.8(@babel/core@7.23.7) - '@babel/plugin-transform-computed-properties': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-destructuring': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-flow-strip-types': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-for-of': 7.23.6(@babel/core@7.23.7) - '@babel/plugin-transform-function-name': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-literals': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-member-expression-literals': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-object-super': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-property-literals': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-react-display-name': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.23.7) - '@babel/plugin-transform-shorthand-properties': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-spread': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-template-literals': 7.23.3(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.26.0) + '@babel/plugin-proposal-object-rest-spread': 7.20.7(@babel/core@7.26.0) + '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.26.0) + '@babel/plugin-syntax-flow': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.26.0) + '@babel/plugin-transform-arrow-functions': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-block-scoped-functions': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.26.0) + '@babel/plugin-transform-classes': 7.23.8(@babel/core@7.26.0) + '@babel/plugin-transform-computed-properties': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-destructuring': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-flow-strip-types': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-for-of': 7.23.6(@babel/core@7.26.0) + '@babel/plugin-transform-function-name': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-literals': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-member-expression-literals': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-object-super': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-property-literals': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-react-display-name': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.26.0) + '@babel/plugin-transform-shorthand-properties': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-spread': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-template-literals': 7.23.3(@babel/core@7.26.0) babel-plugin-syntax-trailing-function-commas: 7.0.0-beta.0 dev: true - /babel-preset-jest@27.5.1(@babel/core@7.23.7): + /babel-preset-jest@27.5.1(@babel/core@7.26.0): resolution: {integrity: sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 babel-plugin-jest-hoist: 27.5.1 - babel-preset-current-node-syntax: 1.0.1(@babel/core@7.23.7) + babel-preset-current-node-syntax: 1.0.1(@babel/core@7.26.0) dev: true - /babel-preset-jest@29.6.3(@babel/core@7.23.7): + /babel-preset-jest@29.6.3(@babel/core@7.26.0): resolution: {integrity: sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 babel-plugin-jest-hoist: 29.6.3 - babel-preset-current-node-syntax: 1.0.1(@babel/core@7.23.7) + babel-preset-current-node-syntax: 1.0.1(@babel/core@7.26.0) dev: true /babel-preset-react-app@10.0.1: resolution: {integrity: sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==} dependencies: - '@babel/core': 7.23.7 - '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.23.7) - '@babel/plugin-proposal-decorators': 7.23.7(@babel/core@7.23.7) - '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.23.7) - '@babel/plugin-proposal-numeric-separator': 7.18.6(@babel/core@7.23.7) - '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.23.7) - '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.23.7) - '@babel/plugin-proposal-private-property-in-object': 7.21.11(@babel/core@7.23.7) - '@babel/plugin-transform-flow-strip-types': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-react-display-name': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-transform-runtime': 7.23.7(@babel/core@7.23.7) - '@babel/preset-env': 7.23.8(@babel/core@7.23.7) - '@babel/preset-react': 7.23.3(@babel/core@7.23.7) - '@babel/preset-typescript': 7.23.3(@babel/core@7.23.7) + '@babel/core': 7.26.0 + '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.26.0) + '@babel/plugin-proposal-decorators': 7.23.7(@babel/core@7.26.0) + '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6(@babel/core@7.26.0) + '@babel/plugin-proposal-numeric-separator': 7.18.6(@babel/core@7.26.0) + '@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.26.0) + '@babel/plugin-proposal-private-methods': 7.18.6(@babel/core@7.26.0) + '@babel/plugin-proposal-private-property-in-object': 7.21.11(@babel/core@7.26.0) + '@babel/plugin-transform-flow-strip-types': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-react-display-name': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-transform-runtime': 7.23.7(@babel/core@7.26.0) + '@babel/preset-env': 7.23.8(@babel/core@7.26.0) + '@babel/preset-react': 7.23.3(@babel/core@7.26.0) + '@babel/preset-typescript': 7.23.3(@babel/core@7.26.0) '@babel/runtime': 7.24.5 babel-plugin-macros: 3.1.0 babel-plugin-transform-react-remove-prop-types: 0.4.24 @@ -11390,7 +11487,6 @@ packages: /commander@6.2.1: resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==} engines: {node: '>= 6'} - dev: false /commander@7.2.0: resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==} @@ -14942,7 +15038,7 @@ packages: resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==} engines: {node: '>=8'} dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/parser': 7.23.6 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.2 @@ -14955,7 +15051,7 @@ packages: resolution: {integrity: sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==} engines: {node: '>=10'} dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/parser': 7.23.6 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.2 @@ -15158,10 +15254,10 @@ packages: ts-node: optional: true dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@jest/test-sequencer': 27.5.1 '@jest/types': 27.5.1 - babel-jest: 27.5.1(@babel/core@7.23.7) + babel-jest: 27.5.1(@babel/core@7.26.0) chalk: 4.1.2 ci-info: 3.9.0 deepmerge: 4.3.1 @@ -15202,11 +15298,11 @@ packages: ts-node: optional: true dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@jest/test-sequencer': 29.7.0 '@jest/types': 29.6.3 '@types/node': 18.19.8 - babel-jest: 29.7.0(@babel/core@7.23.7) + babel-jest: 29.7.0(@babel/core@7.26.0) chalk: 4.1.2 ci-info: 3.9.0 deepmerge: 4.3.1 @@ -15725,16 +15821,16 @@ packages: resolution: {integrity: sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/generator': 7.23.6 - '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.23.7) + '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.26.0) '@babel/traverse': 7.23.7 '@babel/types': 7.23.6 '@jest/transform': 27.5.1 '@jest/types': 27.5.1 '@types/babel__traverse': 7.20.5 '@types/prettier': 2.7.3 - babel-preset-current-node-syntax: 1.0.1(@babel/core@7.23.7) + babel-preset-current-node-syntax: 1.0.1(@babel/core@7.26.0) chalk: 4.1.2 expect: 27.5.1 graceful-fs: 4.2.11 @@ -15755,15 +15851,15 @@ packages: resolution: {integrity: sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 '@babel/generator': 7.23.6 - '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.7) - '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.23.7) + '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.26.0) + '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.26.0) '@babel/types': 7.23.6 '@jest/expect-utils': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - babel-preset-current-node-syntax: 1.0.1(@babel/core@7.23.7) + babel-preset-current-node-syntax: 1.0.1(@babel/core@7.26.0) chalk: 4.1.2 expect: 29.7.0 graceful-fs: 4.2.11 @@ -16031,6 +16127,12 @@ packages: resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} engines: {node: '>=4'} hasBin: true + dev: true + + /jsesc@3.0.2: + resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==} + engines: {node: '>=6'} + hasBin: true /json-bigint@1.0.0: resolution: {integrity: sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==} @@ -17426,7 +17528,7 @@ packages: commander: 8.3.0 ora: 5.4.1 - /next@14.2.18(@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.18(@babel/core@7.26.0)(@opentelemetry/api@1.7.0)(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-H9qbjDuGivUDEnK6wa+p2XKO+iMzgVgyr9Zp/4Iv29lKa+DYaxJGjOeEA+5VOvJh/M7HLiskehInSa0cWxVXUw==} engines: {node: '>=18.17.0'} hasBin: true @@ -17455,7 +17557,7 @@ packages: 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) + styled-jsx: 5.1.1(@babel/core@7.26.0)(react@18.3.1) optionalDependencies: '@next/swc-darwin-arm64': 14.2.18 '@next/swc-darwin-x64': 14.2.18 @@ -18211,10 +18313,6 @@ packages: dependencies: split2: 4.2.0 - /picocolors@1.0.0: - resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} - dev: true - /picocolors@1.1.1: resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} @@ -18349,7 +18447,7 @@ packages: engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.7 - picocolors: 1.0.0 + picocolors: 1.1.1 source-map-js: 1.2.1 dev: true @@ -20155,7 +20253,7 @@ packages: tslib: 2.6.2 dev: false - /styled-jsx@5.1.1(@babel/core@7.23.7)(react@18.3.1): + /styled-jsx@5.1.1(@babel/core@7.26.0)(react@18.3.1): resolution: {integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==} engines: {node: '>= 12.0.0'} peerDependencies: @@ -20168,7 +20266,7 @@ packages: babel-plugin-macros: optional: true dependencies: - '@babel/core': 7.23.7 + '@babel/core': 7.26.0 client-only: 0.0.1 react: 18.3.1 From 2f73d26a7ce2fa5dd326f82333068579d45f4219 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 13:31:04 +0100 Subject: [PATCH 100/121] Update dependency @types/react-router-dom to ^5.3.3 (#221) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index fae1083e..3d65b506 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -79,7 +79,7 @@ "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", "@types/react-router": "^5.1.20", - "@types/react-router-dom": "^5.1.7", + "@types/react-router-dom": "^5.3.3", "@types/webpack-env": "^1.18.5", "babel-loader": "^8.0.0", "babel-preset-react-app": "^10.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index abef78c5..e36f36ae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -213,7 +213,7 @@ importers: specifier: ^5.1.20 version: 5.1.20 '@types/react-router-dom': - specifier: ^5.1.7 + specifier: ^5.3.3 version: 5.3.3 '@types/webpack-env': specifier: ^1.18.5 From f5850c2180abee7c6d2b4499cc6515b8459c8305 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 09:54:58 +0100 Subject: [PATCH 101/121] Update dependency express to ^4.21.1 (#239) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/server/package-lock.json | 3 +- demo/admin/server/package.json | 2 +- demo/api/package.json | 4 +- demo/campaign/package.json | 2 +- demo/site/package.json | 2 +- packages/api/package.json | 2 +- pnpm-lock.yaml | 103 +++++++++++++++++++++++----- 7 files changed, 93 insertions(+), 25 deletions(-) diff --git a/demo/admin/server/package-lock.json b/demo/admin/server/package-lock.json index 557f6b8a..44e8dffd 100644 --- a/demo/admin/server/package-lock.json +++ b/demo/admin/server/package-lock.json @@ -8,7 +8,7 @@ "dependencies": { "compression": "^1.7.5", "envsub": "^4.1.0", - "express": "^4.17.1", + "express": "^4.21.1", "helmet": "^7.2.0" }, "engines": { @@ -537,6 +537,7 @@ "version": "4.21.1", "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", diff --git a/demo/admin/server/package.json b/demo/admin/server/package.json index 0f19aa5d..4d1da594 100644 --- a/demo/admin/server/package.json +++ b/demo/admin/server/package.json @@ -8,7 +8,7 @@ "dependencies": { "compression": "^1.7.5", "envsub": "^4.1.0", - "express": "^4.17.1", + "express": "^4.21.1", "helmet": "^7.2.0" }, "engines": { diff --git a/demo/api/package.json b/demo/api/package.json index f1cbb6c4..50edcce5 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -80,7 +80,7 @@ "compression": "^1.7.5", "cookie-parser": "^1.4.7", "exifr": "^6.3.0", - "express": "^4.18.2", + "express": "^4.21.1", "file-type": "^16.5.4", "graphql": "^15.5.0", "hasha": "^5.2.2", @@ -106,7 +106,7 @@ "@types/cli-progress": "^3.11.6", "@types/compression": "^1.7.5", "@types/cookie-parser": "^1.4.8", - "@types/express": "^4.17.8", + "@types/express": "^4.17.21", "@types/jest": "^27.5.2", "@types/node": "^18.0.6", "@types/node-fetch": "^2.6.12", diff --git a/demo/campaign/package.json b/demo/campaign/package.json index 5f76b308..1c08a10b 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -28,7 +28,7 @@ "@opentelemetry/exporter-trace-otlp-http": "^0.46.0", "@opentelemetry/sdk-node": "^0.46.0", "draft-js": "^0.11.7", - "express": "^4.0.0", + "express": "^4.21.1", "fs-extra": "^9.1.0", "graphql": "^15.0.0", "graphql-request": "^3.7.0", diff --git a/demo/site/package.json b/demo/site/package.json index ae2a5ee5..d4a3299a 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -32,7 +32,7 @@ "@opentelemetry/exporter-trace-otlp-http": "^0.46.0", "@opentelemetry/sdk-node": "^0.46.0", "draft-js": "^0.11.7", - "express": "^4.0.0", + "express": "^4.21.1", "fs-extra": "^9.1.0", "graphql": "^15.0.0", "graphql-request": "^3.7.0", diff --git a/packages/api/package.json b/packages/api/package.json index b3845766..032e9a90 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -59,7 +59,7 @@ "class-transformer": "^0.5.1", "class-validator": "^0.14.1", "eslint": "^8.0.0", - "express": "^4.17.1", + "express": "^4.21.1", "graphql": "^15.5.0", "jest": "^29.7.0", "jest-junit": "^15.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e36f36ae..ea8e6bfe 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -280,7 +280,7 @@ importers: version: link:../../packages/api '@comet/cms-api': specifier: ^7.7.0 - version: 7.7.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.20.0)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) + version: 7.7.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.21.1)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) '@faker-js/faker': specifier: ^8.4.1 version: 8.4.1 @@ -343,7 +343,7 @@ importers: version: 3.13.0(graphql@15.8.0) apollo-server-express: specifier: ^3.3.0 - version: 3.13.0(express@4.20.0)(graphql@15.8.0) + version: 3.13.0(express@4.21.1)(graphql@15.8.0) class-transformer: specifier: ^0.5.1 version: 0.5.1 @@ -366,8 +366,8 @@ importers: specifier: ^6.3.0 version: 6.3.0 express: - specifier: ^4.18.2 - version: 4.20.0 + specifier: ^4.21.1 + version: 4.21.1 file-type: specifier: ^16.5.4 version: 16.5.4 @@ -439,7 +439,7 @@ importers: specifier: ^1.4.8 version: 1.4.8(@types/express@4.17.21) '@types/express': - specifier: ^4.17.8 + specifier: ^4.17.21 version: 4.17.21 '@types/jest': specifier: ^27.5.2 @@ -511,8 +511,8 @@ importers: specifier: ^0.11.7 version: 0.11.7(react-dom@18.3.1)(react@18.3.1) express: - specifier: ^4.0.0 - version: 4.20.0 + specifier: ^4.21.1 + version: 4.21.1 fs-extra: specifier: ^9.1.0 version: 9.1.0 @@ -662,8 +662,8 @@ importers: specifier: ^0.11.7 version: 0.11.7(react-dom@18.3.1)(react@18.3.1) express: - specifier: ^4.0.0 - version: 4.20.0 + specifier: ^4.21.1 + version: 4.21.1 fs-extra: specifier: ^9.1.0 version: 9.1.0 @@ -939,7 +939,7 @@ importers: version: 7.7.0(@nestjs/common@9.4.3) '@comet/cms-api': specifier: ^7.7.0 - version: 7.7.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.20.0)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) + version: 7.7.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.21.1)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) '@comet/eslint-config': specifier: ^7.7.0 version: 7.7.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@29.1.1)(typescript@4.9.5) @@ -1007,8 +1007,8 @@ importers: specifier: ^8.0.0 version: 8.56.0 express: - specifier: ^4.17.1 - version: 4.20.0 + specifier: ^4.21.1 + version: 4.21.1 graphql: specifier: ^15.5.0 version: 15.8.0 @@ -4150,7 +4150,7 @@ packages: - draft-js - history - /@comet/cms-api@7.7.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.20.0)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1): + /@comet/cms-api@7.7.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.21.1)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1): resolution: {integrity: sha512-Sx92DWQuZmGcYbh147FF+TTW+mO6M115rDez70mEPJFHWaKbjcJGyzxJht048TsBLmnpSL9wBBg31ILKVogl+w==} hasBin: true peerDependencies: @@ -4203,7 +4203,7 @@ packages: dataloader: 2.2.2 date-fns: 2.30.0 exifr: 7.1.3 - express: 4.20.0 + express: 4.21.1 fast-xml-parser: 4.5.0 file-type: 16.5.4 get-image-colors: 4.0.1 @@ -6731,7 +6731,7 @@ packages: '@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.14.1)(graphql@15.8.0)(reflect-metadata@0.1.14) apollo-server-core: 3.13.0(graphql@15.8.0) - apollo-server-express: 3.13.0(express@4.20.0)(graphql@15.8.0) + apollo-server-express: 3.13.0(express@4.21.1)(graphql@15.8.0) graphql: 15.8.0 iterall: 1.3.0 lodash.omit: 4.5.0 @@ -8937,7 +8937,7 @@ packages: /@types/express@4.17.14: resolution: {integrity: sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==} dependencies: - '@types/body-parser': 1.19.2 + '@types/body-parser': 1.19.5 '@types/express-serve-static-core': 4.17.41 '@types/qs': 6.9.11 '@types/serve-static': 1.15.5 @@ -10183,7 +10183,7 @@ packages: graphql: 15.8.0 dev: false - /apollo-server-express@3.13.0(express@4.20.0)(graphql@15.8.0): + /apollo-server-express@3.13.0(express@4.21.1)(graphql@15.8.0): resolution: {integrity: sha512-iSxICNbDUyebOuM8EKb3xOrpIwOQgKxGbR2diSr4HP3IW8T3njKFOoMce50vr+moOCe1ev8BnLcw9SNbuUtf7g==} engines: {node: '>=12.0'} peerDependencies: @@ -10200,7 +10200,7 @@ packages: apollo-server-types: 3.8.0(graphql@15.8.0) body-parser: 1.20.2 cors: 2.8.5 - express: 4.20.0 + express: 4.21.1 graphql: 15.8.0 parseurl: 1.3.3 transitivePeerDependencies: @@ -11614,6 +11614,10 @@ packages: resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==} engines: {node: '>= 0.6'} + /cookie@0.7.1: + resolution: {integrity: sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==} + engines: {node: '>= 0.6'} + /cookie@0.7.2: resolution: {integrity: sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==} engines: {node: '>= 0.6'} @@ -13211,6 +13215,44 @@ packages: transitivePeerDependencies: - supports-color + /express@4.21.1: + resolution: {integrity: sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==} + engines: {node: '>= 0.10.0'} + dependencies: + accepts: 1.3.8 + array-flatten: 1.1.1 + body-parser: 1.20.3 + content-disposition: 0.5.4 + content-type: 1.0.5 + cookie: 0.7.1 + cookie-signature: 1.0.6 + debug: 2.6.9 + depd: 2.0.0 + encodeurl: 2.0.0 + escape-html: 1.0.3 + etag: 1.8.1 + finalhandler: 1.3.1 + fresh: 0.5.2 + http-errors: 2.0.0 + merge-descriptors: 1.0.3 + methods: 1.1.2 + on-finished: 2.4.1 + parseurl: 1.3.3 + path-to-regexp: 0.1.10 + proxy-addr: 2.0.7 + qs: 6.13.0 + range-parser: 1.2.1 + safe-buffer: 5.2.1 + send: 0.19.0 + serve-static: 1.16.2 + setprototypeof: 1.2.0 + statuses: 2.0.1 + type-is: 1.6.18 + utils-merge: 1.0.1 + vary: 1.1.2 + transitivePeerDependencies: + - supports-color + /extend@3.0.2: resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==} @@ -13476,6 +13518,20 @@ packages: transitivePeerDependencies: - supports-color + /finalhandler@1.3.1: + resolution: {integrity: sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==} + engines: {node: '>= 0.8'} + dependencies: + debug: 2.6.9 + encodeurl: 2.0.0 + escape-html: 1.0.3 + on-finished: 2.4.1 + parseurl: 1.3.3 + statuses: 2.0.1 + unpipe: 1.0.0 + transitivePeerDependencies: + - supports-color + /find-cache-dir@3.3.2: resolution: {integrity: sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==} engines: {node: '>=8'} @@ -19675,6 +19731,17 @@ packages: transitivePeerDependencies: - supports-color + /serve-static@1.16.2: + resolution: {integrity: sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==} + engines: {node: '>= 0.8.0'} + dependencies: + encodeurl: 2.0.0 + escape-html: 1.0.3 + parseurl: 1.3.3 + send: 0.19.0 + transitivePeerDependencies: + - supports-color + /server-only@0.0.1: resolution: {integrity: sha512-qepMx2JxAa5jjfzxG79yPPq+8BuFToHd1hm7kI+Z4zAq1ftQiP7HcxMhDDItrbtwVeLg/cY2JnKnrcFkmiswNA==} dev: false From 2faad78915126df9a4a871d27da10d920e873474 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 09:57:40 +0100 Subject: [PATCH 102/121] Update dependency babel-loader to ^8.4.1 (#237) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 3d65b506..a069fd4c 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -81,7 +81,7 @@ "@types/react-router": "^5.1.20", "@types/react-router-dom": "^5.3.3", "@types/webpack-env": "^1.18.5", - "babel-loader": "^8.0.0", + "babel-loader": "^8.4.1", "babel-preset-react-app": "^10.0.1", "chokidar-cli": "^2.1.0", "cross-env": "^7.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ea8e6bfe..b05fb030 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -219,8 +219,8 @@ importers: specifier: ^1.18.5 version: 1.18.5 babel-loader: - specifier: ^8.0.0 - version: 8.3.0(@babel/core@7.26.0)(webpack@5.94.0) + specifier: ^8.4.1 + version: 8.4.1(@babel/core@7.26.0)(webpack@5.94.0) babel-preset-react-app: specifier: ^10.0.1 version: 10.0.1 @@ -10528,8 +10528,8 @@ packages: - supports-color dev: true - /babel-loader@8.3.0(@babel/core@7.26.0)(webpack@5.94.0): - resolution: {integrity: sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==} + /babel-loader@8.4.1(@babel/core@7.26.0)(webpack@5.94.0): + resolution: {integrity: sha512-nXzRChX+Z1GoE6yWavBQg6jDslyFF3SDjl2paADuoQtQW10JqShJt62R6eJQ5m/pjJFDT8xgKIWSP85OY8eXeA==} engines: {node: '>= 8.9'} peerDependencies: '@babel/core': ^7.0.0 From e99bb5d2aa187604a1b2cf6cf0127b7b086e0eec Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 09:57:59 +0100 Subject: [PATCH 103/121] Update dependency css-loader to ^6.11.0 (#238) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- pnpm-lock.yaml | 73 ++++++++++++++++++++--------------------- 2 files changed, 36 insertions(+), 39 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index a069fd4c..83e07df1 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -85,7 +85,7 @@ "babel-preset-react-app": "^10.0.1", "chokidar-cli": "^2.1.0", "cross-env": "^7.0.3", - "css-loader": "^6.0.0", + "css-loader": "^6.11.0", "dotenv-cli": "^6.0.0", "eslint": "^8.0.0", "html-webpack-plugin": "^5.6.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b05fb030..d0ebb029 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -231,8 +231,8 @@ importers: specifier: ^7.0.3 version: 7.0.3 css-loader: - specifier: ^6.0.0 - version: 6.9.0(webpack@5.94.0) + specifier: ^6.11.0 + version: 6.11.0(webpack@5.94.0) dotenv-cli: specifier: ^6.0.0 version: 6.0.0 @@ -11776,18 +11776,24 @@ packages: engines: {node: '>=4'} dev: false - /css-loader@6.9.0(webpack@5.94.0): - resolution: {integrity: sha512-3I5Nu4ytWlHvOP6zItjiHlefBNtrH+oehq8tnQa2kO305qpVyx9XNIT1CXIj5bgCJs7qICBCkgCYxQLKPANoLA==} + /css-loader@6.11.0(webpack@5.94.0): + resolution: {integrity: sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==} engines: {node: '>= 12.13.0'} peerDependencies: + '@rspack/core': 0.x || 1.x webpack: ^5.0.0 + peerDependenciesMeta: + '@rspack/core': + optional: true + webpack: + optional: true dependencies: - icss-utils: 5.1.0(postcss@8.4.33) - postcss: 8.4.33 - postcss-modules-extract-imports: 3.0.0(postcss@8.4.33) - postcss-modules-local-by-default: 4.0.3(postcss@8.4.33) - postcss-modules-scope: 3.1.0(postcss@8.4.33) - postcss-modules-values: 4.0.0(postcss@8.4.33) + icss-utils: 5.1.0(postcss@8.4.38) + postcss: 8.4.38 + postcss-modules-extract-imports: 3.1.0(postcss@8.4.38) + postcss-modules-local-by-default: 4.1.0(postcss@8.4.38) + postcss-modules-scope: 3.2.1(postcss@8.4.38) + postcss-modules-values: 4.0.0(postcss@8.4.38) postcss-value-parser: 4.2.0 semver: 7.5.4 webpack: 5.94.0(webpack-cli@4.10.0) @@ -14533,13 +14539,13 @@ packages: dependencies: safer-buffer: 2.1.2 - /icss-utils@5.1.0(postcss@8.4.33): + /icss-utils@5.1.0(postcss@8.4.38): resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - postcss: 8.4.33 + postcss: 8.4.38 dev: true /ieee754@1.2.1: @@ -18438,49 +18444,49 @@ packages: resolution: {integrity: sha512-3IKLNXclQgkU++2fSi93sQ6BznFuxSLB11HdvZQ6JW/spahf/P1pAHBQEahr20rs0htZW0UDkM1HmA+nZkXKsw==} engines: {node: '>=12.0.0'} - /postcss-modules-extract-imports@3.0.0(postcss@8.4.33): - resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==} + /postcss-modules-extract-imports@3.1.0(postcss@8.4.38): + resolution: {integrity: sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - postcss: 8.4.33 + postcss: 8.4.38 dev: true - /postcss-modules-local-by-default@4.0.3(postcss@8.4.33): - resolution: {integrity: sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==} + /postcss-modules-local-by-default@4.1.0(postcss@8.4.38): + resolution: {integrity: sha512-rm0bdSv4jC3BDma3s9H19ZddW0aHX6EoqwDYU2IfZhRN+53QrufTRo2IdkAbRqLx4R2IYbZnbjKKxg4VN5oU9Q==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - icss-utils: 5.1.0(postcss@8.4.33) - postcss: 8.4.33 - postcss-selector-parser: 6.0.15 + icss-utils: 5.1.0(postcss@8.4.38) + postcss: 8.4.38 + postcss-selector-parser: 7.0.0 postcss-value-parser: 4.2.0 dev: true - /postcss-modules-scope@3.1.0(postcss@8.4.33): - resolution: {integrity: sha512-SaIbK8XW+MZbd0xHPf7kdfA/3eOt7vxJ72IRecn3EzuZVLr1r0orzf0MX/pN8m+NMDoo6X/SQd8oeKqGZd8PXg==} + /postcss-modules-scope@3.2.1(postcss@8.4.38): + resolution: {integrity: sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - postcss: 8.4.33 - postcss-selector-parser: 6.0.15 + postcss: 8.4.38 + postcss-selector-parser: 7.0.0 dev: true - /postcss-modules-values@4.0.0(postcss@8.4.33): + /postcss-modules-values@4.0.0(postcss@8.4.38): resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==} engines: {node: ^10 || ^12 || >= 14} peerDependencies: postcss: ^8.1.0 dependencies: - icss-utils: 5.1.0(postcss@8.4.33) - postcss: 8.4.33 + icss-utils: 5.1.0(postcss@8.4.38) + postcss: 8.4.38 dev: true - /postcss-selector-parser@6.0.15: - resolution: {integrity: sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==} + /postcss-selector-parser@7.0.0: + resolution: {integrity: sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==} engines: {node: '>=4'} dependencies: cssesc: 3.0.0 @@ -18498,15 +18504,6 @@ packages: picocolors: 1.1.1 source-map-js: 1.2.1 - /postcss@8.4.33: - resolution: {integrity: sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==} - engines: {node: ^10 || ^12 || >=14} - dependencies: - nanoid: 3.3.7 - picocolors: 1.1.1 - source-map-js: 1.2.1 - dev: true - /postcss@8.4.38: resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==} engines: {node: ^10 || ^12 || >=14} From a71ef22fe86d79fa9ce63c71a259d0ae8d52e73d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 13:04:40 +0100 Subject: [PATCH 104/121] Update Apollo GraphQL packages (#209) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 4 +- demo/api/package.json | 4 +- packages/admin/package.json | 4 +- pnpm-lock.yaml | 86 +++++++++++++++++++------------------ 4 files changed, 50 insertions(+), 48 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 83e07df1..e4ae104a 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -23,7 +23,7 @@ "start": "npm run intl:compile && run-p gql:types generate-block-types && dotenv -c secrets -- cross-env BABEL_ENV=development webpack serve --config ./webpack.config.ts --mode development" }, "dependencies": { - "@apollo/client": "^3.11.8", + "@apollo/client": "^3.12.2", "@babel/core": "^7.26.0", "@comet/admin": "^7.7.0", "@comet/admin-icons": "^7.7.0", @@ -46,7 +46,7 @@ "file-saver": "^2.0.5", "final-form": "^4.16.1", "graphql": "^15.4.0", - "graphql-tag": "^2.0.0", + "graphql-tag": "^2.12.6", "history": "^4.10.1", "lodash.isequal": "^4.5.0", "material-design-icons": "^3.0.1", diff --git a/demo/api/package.json b/demo/api/package.json index 50edcce5..4369698a 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -71,8 +71,8 @@ "@opentelemetry/auto-instrumentations-node": "^0.40.0", "@opentelemetry/exporter-trace-otlp-http": "^0.46.0", "@opentelemetry/sdk-node": "^0.46.0", - "apollo-server-core": "^3.3.0", - "apollo-server-express": "^3.3.0", + "apollo-server-core": "^3.13.0", + "apollo-server-express": "^3.13.0", "class-transformer": "^0.5.1", "class-validator": "^0.14.1", "cli-progress": "^3.12.0", diff --git a/packages/admin/package.json b/packages/admin/package.json index 7031968e..db766b05 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -34,7 +34,7 @@ "react-dropzone": "^14.2.3" }, "devDependencies": { - "@apollo/client": "^3.11.8", + "@apollo/client": "^3.12.2", "@babel/cli": "^7.25.9", "@babel/core": "^7.26.0", "@comet/admin": "^7.7.0", @@ -74,7 +74,7 @@ "typescript": "^4.9.5" }, "peerDependencies": { - "@apollo/client": "^3.2.5", + "@apollo/client": "^3.12.2", "@comet/admin": "^7.7.0", "@comet/admin-date-time": "^7.7.0", "@comet/admin-icons": "^7.7.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d0ebb029..381feb8c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -50,32 +50,32 @@ importers: demo/admin: dependencies: '@apollo/client': - 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) + specifier: ^3.12.2 + version: 3.12.2(@types/react@17.0.75)(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) '@babel/core': specifier: ^7.26.0 version: 7.26.0 '@comet/admin': specifier: ^7.7.0 - version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0 version: 7.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@comet/admin-rte': specifier: ^7.7.0 - version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0 version: 7.7.0(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@comet/blocks-admin': specifier: ^7.7.0 - version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0 - version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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) @@ -119,7 +119,7 @@ importers: specifier: ^15.4.0 version: 15.8.0 graphql-tag: - specifier: ^2.0.0 + specifier: ^2.12.6 version: 2.12.6(graphql@15.8.0) history: specifier: ^4.10.1 @@ -339,10 +339,10 @@ importers: specifier: ^0.46.0 version: 0.46.0(@opentelemetry/api@1.7.0) apollo-server-core: - specifier: ^3.3.0 + specifier: ^3.13.0 version: 3.13.0(graphql@15.8.0) apollo-server-express: - specifier: ^3.3.0 + specifier: ^3.13.0 version: 3.13.0(express@4.21.1)(graphql@15.8.0) class-transformer: specifier: ^0.5.1 @@ -796,8 +796,8 @@ importers: version: 14.2.3(react@17.0.2) devDependencies: '@apollo/client': - 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) + specifier: ^3.12.2 + version: 3.12.2(@types/react@17.0.75)(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) '@babel/cli': specifier: ^7.25.9 version: 7.25.9(@babel/core@7.26.0) @@ -806,22 +806,22 @@ importers: version: 7.26.0 '@comet/admin': specifier: ^7.7.0 - version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0 version: 7.7.0(@babel/cli@7.25.9) '@comet/admin-date-time': specifier: ^7.7.0 - version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0 version: 7.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@comet/blocks-admin': specifier: ^7.7.0 - version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0 - version: 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0 version: 7.7.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5) @@ -1107,13 +1107,13 @@ packages: - chokidar dev: true - /@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==} + /@apollo/client@3.12.2(@types/react@17.0.75)(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2): + resolution: {integrity: sha512-dkacsdMgVsrrQhLpN4JqZTIEfnNsPVwny+4vccSRqheWZElzUz1Xi0h39p2+TieS1f+wwvyzwpoJEV57vwzT9Q==} peerDependencies: graphql: ^15.0.0 || ^16.0.0 graphql-ws: ^5.5.5 - 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 + react: ^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc subscriptions-transport-ws: ^0.9.0 || ^0.11.0 peerDependenciesMeta: graphql-ws: @@ -1140,7 +1140,7 @@ packages: response-iterator: 0.2.6 symbol-observable: 4.0.0 ts-invariant: 0.10.3 - tslib: 2.6.2 + tslib: 2.8.1 zen-observable-ts: 1.2.5 transitivePeerDependencies: - '@types/react' @@ -3831,7 +3831,7 @@ packages: - supports-color dev: true - /@comet/admin-date-time@7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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-btbHQFz4Suwiur4dn9eXljY+zD/0B2xTeGnECpnixVrCCRqzflmFmPMDSVZjXv4j/npoBTEcKPhgShozvP7myQ==} peerDependencies: '@mui/material': ^5.0.0 @@ -3840,7 +3840,7 @@ packages: react-final-form: ^6.5.7 react-intl: ^5.0.0 || ^6.0.0 dependencies: - '@comet/admin': 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.16.7(@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) @@ -3880,7 +3880,7 @@ packages: use-constant: 1.1.1(react@17.0.2) uuid: 9.0.1 - /@comet/admin-rte@7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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-ic6Xu/J6YUcz6DgO6J/AKMCxLLjjBS3cteVSuQMKMMkxMiAezoUhGtFUvLd1GH/ST57aE4wwB4pdPVItWTgaig==} peerDependencies: '@mui/material': ^5.0.0 @@ -3891,7 +3891,7 @@ packages: react-final-form: ^6.3.1 react-intl: ^5.0.0 || ^6.0.0 dependencies: - '@comet/admin': 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.16.7(@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 @@ -3936,7 +3936,7 @@ packages: - '@types/react' - react-dom - /@comet/admin@7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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-CXw8EgFjbRaIUdEKdBjbSOHY4GyTxqqe4ZxSyvgwosrpG6t0eD/4sknvSEwQMSPVl3FsJzeuoQkDj8yX0f/YDQ==} peerDependencies: '@apollo/client': ^3.7.0 @@ -3964,7 +3964,7 @@ packages: react-dnd: optional: true dependencies: - '@apollo/client': 3.11.8(@types/react@17.0.75)(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) + '@apollo/client': 3.12.2(@types/react@17.0.75)(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) '@comet/admin-icons': 7.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@comet/admin-theme': 7.7.0(@mui/material@5.16.7)(@mui/system@5.16.7)(@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) @@ -3999,7 +3999,7 @@ packages: - '@mui/system' - '@types/react' - /@comet/blocks-admin@7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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-J2IJccacYuiJSehTEfeV4hKTTQtl8HvPF8+BwFAItxNirTBi5arSb73Gcg3W2bawi1mf0uHtFE39SMK+Kn+58g==} peerDependencies: '@mui/material': ^5.0.0 @@ -4011,7 +4011,7 @@ packages: react-router: ^5.0.0 react-router-dom: ^5.0.0 dependencies: - '@comet/admin': 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@mui/lab': 5.0.0-alpha.173(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.16.7(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) @@ -4062,7 +4062,7 @@ packages: ts-node: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) dev: true - /@comet/cms-admin@7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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-FARsHyD2+c6ba1yObRG4yosJ7eJPT1Tnx6vLrdriCcsy6T5rGZLr1oJKT5rNKkb/Yw+SbNXrqEvIes+8jpBVHw==} hasBin: true peerDependencies: @@ -4082,13 +4082,13 @@ packages: react-router: ^5.0.0 react-router-dom: ^5.0.0 dependencies: - '@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.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.12.2(@types/react@17.0.75)(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin': 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) - '@comet/admin-rte': 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) - '@comet/blocks-admin': 7.7.0(@apollo/client@3.11.8)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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) @@ -10114,7 +10114,7 @@ packages: /apollo-datasource@3.3.2: resolution: {integrity: sha512-L5TiS8E2Hn/Yz7SSnWIVbZw0ZfEIXZCa5VUiVxD9P53JvSrf4aStvsFDlGWPvpIdCR+aly2CfoB79B9/JjKFqg==} engines: {node: '>=12.0'} - deprecated: The `apollo-datasource` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. + deprecated: The `apollo-datasource` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. dependencies: '@apollo/utils.keyvaluecache': 1.0.2 apollo-server-env: 4.2.1 @@ -10124,7 +10124,7 @@ packages: /apollo-reporting-protobuf@3.4.0: resolution: {integrity: sha512-h0u3EbC/9RpihWOmcSsvTW2O6RXVaD/mPEjfrPkxRPTEPWqncsgOoRJw+wih4OqfH3PvTJvoEIf4LwKrUaqWog==} - deprecated: The `apollo-reporting-protobuf` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/usage-reporting-protobuf` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. + deprecated: The `apollo-reporting-protobuf` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/usage-reporting-protobuf` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. dependencies: '@apollo/protobufjs': 1.2.6 dev: false @@ -10132,6 +10132,7 @@ packages: /apollo-server-core@3.13.0(graphql@15.8.0): resolution: {integrity: sha512-v/g6DR6KuHn9DYSdtQijz8dLOkP78I5JSVJzPkARhDbhpH74QNwrQ2PP2URAPPEDJ2EeZNQDX8PvbYkAKqg+kg==} engines: {node: '>=12.0'} + deprecated: The `apollo-server-core` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. peerDependencies: graphql: ^15.3.0 || ^16.0.0 dependencies: @@ -10166,7 +10167,7 @@ packages: /apollo-server-env@4.2.1: resolution: {integrity: sha512-vm/7c7ld+zFMxibzqZ7SSa5tBENc4B0uye9LTfjJwGoQFY5xsUPH5FpO5j0bMUDZ8YYNbrF9SNtzc5Cngcr90g==} engines: {node: '>=12.0'} - deprecated: The `apollo-server-env` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/utils.fetcher` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. + deprecated: The `apollo-server-env` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/utils.fetcher` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. dependencies: node-fetch: 2.7.0 transitivePeerDependencies: @@ -10176,7 +10177,7 @@ packages: /apollo-server-errors@3.3.1(graphql@15.8.0): resolution: {integrity: sha512-xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA==} engines: {node: '>=12.0'} - deprecated: The `apollo-server-errors` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. + deprecated: The `apollo-server-errors` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. peerDependencies: graphql: ^15.3.0 || ^16.0.0 dependencies: @@ -10186,6 +10187,7 @@ packages: /apollo-server-express@3.13.0(express@4.21.1)(graphql@15.8.0): resolution: {integrity: sha512-iSxICNbDUyebOuM8EKb3xOrpIwOQgKxGbR2diSr4HP3IW8T3njKFOoMce50vr+moOCe1ev8BnLcw9SNbuUtf7g==} engines: {node: '>=12.0'} + deprecated: The `apollo-server-express` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. peerDependencies: express: ^4.17.1 graphql: ^15.3.0 || ^16.0.0 @@ -10198,7 +10200,7 @@ packages: accepts: 1.3.8 apollo-server-core: 3.13.0(graphql@15.8.0) apollo-server-types: 3.8.0(graphql@15.8.0) - body-parser: 1.20.2 + body-parser: 1.20.3 cors: 2.8.5 express: 4.21.1 graphql: 15.8.0 @@ -10211,7 +10213,7 @@ packages: /apollo-server-plugin-base@3.7.2(graphql@15.8.0): resolution: {integrity: sha512-wE8dwGDvBOGehSsPTRZ8P/33Jan6/PmL0y0aN/1Z5a5GcbFhDaaJCjK5cav6npbbGL2DPKK0r6MPXi3k3N45aw==} engines: {node: '>=12.0'} - deprecated: The `apollo-server-plugin-base` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. + deprecated: The `apollo-server-plugin-base` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. peerDependencies: graphql: ^15.3.0 || ^16.0.0 dependencies: @@ -10224,7 +10226,7 @@ packages: /apollo-server-types@3.8.0(graphql@15.8.0): resolution: {integrity: sha512-ZI/8rTE4ww8BHktsVpb91Sdq7Cb71rdSkXELSwdSR0eXu600/sY+1UXhTWdiJvk+Eq5ljqoHLwLbY2+Clq2b9A==} engines: {node: '>=12.0'} - deprecated: The `apollo-server-types` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. + deprecated: The `apollo-server-types` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. peerDependencies: graphql: ^15.3.0 || ^16.0.0 dependencies: @@ -14125,7 +14127,7 @@ packages: 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 + tslib: 2.8.1 /graphql-ws@5.11.3(graphql@15.8.0): resolution: {integrity: sha512-fU8zwSgAX2noXAsuFiCZ8BtXeXZOzXyK5u1LloCdacsVth4skdBMPO74EG51lBoWSIZ8beUocdpV8+cQHBODnQ==} From 748962058975d1cce639fda8476da5f9847ea1ab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 13:05:06 +0100 Subject: [PATCH 105/121] Update dependency final-form to ^4.20.10 (#240) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- packages/admin/package.json | 4 ++-- pnpm-lock.yaml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index e4ae104a..09baa46c 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -44,7 +44,7 @@ "date-fns": "^2.30.0", "draft-js": "^0.11.7", "file-saver": "^2.0.5", - "final-form": "^4.16.1", + "final-form": "^4.20.10", "graphql": "^15.4.0", "graphql-tag": "^2.12.6", "history": "^4.10.1", diff --git a/packages/admin/package.json b/packages/admin/package.json index db766b05..f6433c6b 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -58,7 +58,7 @@ "@types/react-router": "^5.1.20", "draft-js": "^0.11.7", "eslint": "^8.0.0", - "final-form": "^4.16.1", + "final-form": "^4.20.10", "graphql": "^15.4.0", "history": "^4.10.1", "prettier": "^2.0.0", @@ -87,7 +87,7 @@ "@mui/system": "^5.16.7", "@mui/x-data-grid": "^5.17.26", "draft-js": "^0.11.7", - "final-form": "^4.16.1", + "final-form": "^4.20.10", "graphql": "^15.4.0", "history": "^4.10.1", "react": "^17.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 381feb8c..3f2f8da7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -113,7 +113,7 @@ importers: specifier: ^2.0.5 version: 2.0.5 final-form: - specifier: ^4.16.1 + specifier: ^4.20.10 version: 4.20.10 graphql: specifier: ^15.4.0 @@ -868,7 +868,7 @@ importers: specifier: ^8.0.0 version: 8.56.0 final-form: - specifier: ^4.16.1 + specifier: ^4.20.10 version: 4.20.10 graphql: specifier: ^15.4.0 @@ -13510,7 +13510,7 @@ packages: resolution: {integrity: sha512-TL48Pi1oNHeMOHrKv1bCJUrWZDcD3DIG6AGYVNOnyZPr7Bd/pStN0pL+lfzF5BNoj/FclaoiaLenk4XUIFVYng==} engines: {node: '>=8'} dependencies: - '@babel/runtime': 7.23.8 + '@babel/runtime': 7.24.5 /finalhandler@1.2.0: resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==} From 0c79bfa234b904dc47ac8292c2b9006c7a4df1c7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2024 16:15:37 +0100 Subject: [PATCH 106/121] Update dependency graphql to ^15.9.0 (#241) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- demo/api/package.json | 2 +- demo/campaign/package.json | 2 +- demo/site/package.json | 2 +- packages/admin/package.json | 4 +- packages/api/package.json | 2 +- pnpm-lock.yaml | 719 ++++++++++++++++++------------------ 7 files changed, 367 insertions(+), 366 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 09baa46c..648d0aa5 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -45,7 +45,7 @@ "draft-js": "^0.11.7", "file-saver": "^2.0.5", "final-form": "^4.20.10", - "graphql": "^15.4.0", + "graphql": "^15.9.0", "graphql-tag": "^2.12.6", "history": "^4.10.1", "lodash.isequal": "^4.5.0", diff --git a/demo/api/package.json b/demo/api/package.json index 4369698a..4d5fb4c6 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -82,7 +82,7 @@ "exifr": "^6.3.0", "express": "^4.21.1", "file-type": "^16.5.4", - "graphql": "^15.5.0", + "graphql": "^15.9.0", "hasha": "^5.2.2", "helmet": "^4.6.0", "mime": "^2.6.0", diff --git a/demo/campaign/package.json b/demo/campaign/package.json index 1c08a10b..be791557 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -30,7 +30,7 @@ "draft-js": "^0.11.7", "express": "^4.21.1", "fs-extra": "^9.1.0", - "graphql": "^15.0.0", + "graphql": "^15.9.0", "graphql-request": "^3.7.0", "graphql-tag": "^2.12.6", "mjml": "^4.15.3", diff --git a/demo/site/package.json b/demo/site/package.json index d4a3299a..0f361f88 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -34,7 +34,7 @@ "draft-js": "^0.11.7", "express": "^4.21.1", "fs-extra": "^9.1.0", - "graphql": "^15.0.0", + "graphql": "^15.9.0", "graphql-request": "^3.7.0", "graphql-tag": "^2.12.6", "next": "^14.2.18", diff --git a/packages/admin/package.json b/packages/admin/package.json index f6433c6b..dd5b69c8 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -59,7 +59,7 @@ "draft-js": "^0.11.7", "eslint": "^8.0.0", "final-form": "^4.20.10", - "graphql": "^15.4.0", + "graphql": "^15.9.0", "history": "^4.10.1", "prettier": "^2.0.0", "react": "^17.0", @@ -88,7 +88,7 @@ "@mui/x-data-grid": "^5.17.26", "draft-js": "^0.11.7", "final-form": "^4.20.10", - "graphql": "^15.4.0", + "graphql": "^15.9.0", "history": "^4.10.1", "react": "^17.0", "react-dnd": "^16.0.1", diff --git a/packages/api/package.json b/packages/api/package.json index 032e9a90..7f6fecd5 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -60,7 +60,7 @@ "class-validator": "^0.14.1", "eslint": "^8.0.0", "express": "^4.21.1", - "graphql": "^15.5.0", + "graphql": "^15.9.0", "jest": "^29.7.0", "jest-junit": "^15.0.0", "lodash.isequal": "^4.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3f2f8da7..c7de5abf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -51,31 +51,31 @@ importers: dependencies: '@apollo/client': specifier: ^3.12.2 - version: 3.12.2(@types/react@17.0.75)(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) + version: 3.12.2(@types/react@17.0.75)(graphql@15.9.0)(react-dom@17.0.2)(react@17.0.2) '@babel/core': specifier: ^7.26.0 version: 7.26.0 '@comet/admin': specifier: ^7.7.0 - version: 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0 version: 7.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@comet/admin-rte': specifier: ^7.7.0 - version: 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.9.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.7.0 version: 7.7.0(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@comet/blocks-admin': specifier: ^7.7.0 - version: 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0 - version: 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.9.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) @@ -116,11 +116,11 @@ importers: specifier: ^4.20.10 version: 4.20.10 graphql: - specifier: ^15.4.0 - version: 15.8.0 + specifier: ^15.9.0 + version: 15.9.0 graphql-tag: specifier: ^2.12.6 - version: 2.12.6(graphql@15.8.0) + version: 2.12.6(graphql@15.9.0) history: specifier: ^4.10.1 version: 4.10.1 @@ -175,28 +175,28 @@ importers: version: 35.8.1 '@graphql-codegen/add': specifier: ^3.2.3 - version: 3.2.3(graphql@15.8.0) + version: 3.2.3(graphql@15.9.0) '@graphql-codegen/cli': specifier: ^2.16.5 - version: 2.16.5(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5) + version: 2.16.5(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.9.0)(typescript@4.9.5) '@graphql-codegen/fragment-matcher': specifier: ^2.0.1 - version: 2.0.1(graphql@15.8.0) + version: 2.0.1(graphql@15.9.0) '@graphql-codegen/introspection': specifier: ^2.2.3 - version: 2.2.3(graphql@15.8.0) + version: 2.2.3(graphql@15.9.0) '@graphql-codegen/named-operations-object': specifier: ^2.3.1 - version: 2.3.1(graphql-tag@2.12.6)(graphql@15.8.0) + version: 2.3.1(graphql-tag@2.12.6)(graphql@15.9.0) '@graphql-codegen/near-operation-file-preset': specifier: ^2.5.0 - version: 2.5.0(graphql@15.8.0) + version: 2.5.0(graphql@15.9.0) '@graphql-codegen/typescript': specifier: ^2.8.8 - version: 2.8.8(graphql@15.8.0) + version: 2.8.8(graphql@15.9.0) '@graphql-codegen/typescript-operations': specifier: ^2.5.13 - version: 2.5.13(graphql@15.8.0) + version: 2.5.13(graphql@15.9.0) '@types/lodash.isequal': specifier: ^4.5.8 version: 4.5.8 @@ -280,7 +280,7 @@ importers: version: link:../../packages/api '@comet/cms-api': specifier: ^7.7.0 - version: 7.7.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.21.1)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) + version: 7.7.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.21.1)(graphql@15.9.0)(nestjs-console@8.0.0)(rxjs@7.8.1) '@faker-js/faker': specifier: ^8.4.1 version: 8.4.1 @@ -307,7 +307,7 @@ importers: version: 5.9.8(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8) '@nestjs/apollo': specifier: ^10.2.1 - 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) + 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.9.0) '@nestjs/common': specifier: ^9.4.3 version: 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) @@ -319,7 +319,7 @@ importers: version: 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': specifier: ^10.2.1 - version: 10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(graphql@15.8.0)(reflect-metadata@0.1.14) + version: 10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(graphql@15.9.0)(reflect-metadata@0.1.14) '@nestjs/passport': specifier: ^9.0.3 version: 9.0.3(@nestjs/common@9.4.3)(passport@0.6.0) @@ -340,10 +340,10 @@ importers: version: 0.46.0(@opentelemetry/api@1.7.0) apollo-server-core: specifier: ^3.13.0 - version: 3.13.0(graphql@15.8.0) + version: 3.13.0(graphql@15.9.0) apollo-server-express: specifier: ^3.13.0 - version: 3.13.0(express@4.21.1)(graphql@15.8.0) + version: 3.13.0(express@4.21.1)(graphql@15.9.0) class-transformer: specifier: ^0.5.1 version: 0.5.1 @@ -372,8 +372,8 @@ importers: specifier: ^16.5.4 version: 16.5.4 graphql: - specifier: ^15.5.0 - version: 15.8.0 + specifier: ^15.9.0 + version: 15.9.0 hasha: specifier: ^5.2.2 version: 5.2.2 @@ -517,14 +517,14 @@ importers: specifier: ^9.1.0 version: 9.1.0 graphql: - specifier: ^15.0.0 - version: 15.8.0 + specifier: ^15.9.0 + version: 15.9.0 graphql-request: specifier: ^3.7.0 - version: 3.7.0(graphql@15.8.0) + version: 3.7.0(graphql@15.9.0) graphql-tag: specifier: ^2.12.6 - version: 2.12.6(graphql@15.8.0) + version: 2.12.6(graphql@15.9.0) mjml: specifier: ^4.15.3 version: 4.15.3 @@ -579,22 +579,22 @@ importers: version: 35.8.1 '@graphql-codegen/add': specifier: ^3.2.3 - version: 3.2.3(graphql@15.8.0) + version: 3.2.3(graphql@15.9.0) '@graphql-codegen/cli': specifier: ^2.16.5 - version: 2.16.5(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5) + version: 2.16.5(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.9.0)(typescript@4.9.5) '@graphql-codegen/named-operations-object': specifier: ^2.3.1 - version: 2.3.1(graphql-tag@2.12.6)(graphql@15.8.0) + version: 2.3.1(graphql-tag@2.12.6)(graphql@15.9.0) '@graphql-codegen/near-operation-file-preset': specifier: ^2.5.0 - version: 2.5.0(graphql@15.8.0) + version: 2.5.0(graphql@15.9.0) '@graphql-codegen/typescript': specifier: ^2.8.8 - version: 2.8.8(graphql@15.8.0) + version: 2.8.8(graphql@15.9.0) '@graphql-codegen/typescript-operations': specifier: ^2.5.13 - version: 2.5.13(graphql@15.8.0) + version: 2.5.13(graphql@15.9.0) '@types/draft-js': specifier: ^0.11.18 version: 0.11.18 @@ -668,14 +668,14 @@ importers: specifier: ^9.1.0 version: 9.1.0 graphql: - specifier: ^15.0.0 - version: 15.8.0 + specifier: ^15.9.0 + version: 15.9.0 graphql-request: specifier: ^3.7.0 - version: 3.7.0(graphql@15.8.0) + version: 3.7.0(graphql@15.9.0) graphql-tag: specifier: ^2.12.6 - version: 2.12.6(graphql@15.8.0) + version: 2.12.6(graphql@15.9.0) next: specifier: ^14.2.18 version: 14.2.18(@babel/core@7.26.0)(@opentelemetry/api@1.7.0)(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) @@ -721,22 +721,22 @@ importers: version: 35.8.1 '@graphql-codegen/add': specifier: ^3.2.3 - version: 3.2.3(graphql@15.8.0) + version: 3.2.3(graphql@15.9.0) '@graphql-codegen/cli': specifier: ^2.16.5 - version: 2.16.5(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5) + version: 2.16.5(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.9.0)(typescript@4.9.5) '@graphql-codegen/named-operations-object': specifier: ^2.3.1 - version: 2.3.1(graphql-tag@2.12.6)(graphql@15.8.0) + version: 2.3.1(graphql-tag@2.12.6)(graphql@15.9.0) '@graphql-codegen/near-operation-file-preset': specifier: ^2.5.0 - version: 2.5.0(graphql@15.8.0) + version: 2.5.0(graphql@15.9.0) '@graphql-codegen/typescript': specifier: ^2.8.8 - version: 2.8.8(graphql@15.8.0) + version: 2.8.8(graphql@15.9.0) '@graphql-codegen/typescript-operations': specifier: ^2.5.13 - version: 2.5.13(graphql@15.8.0) + version: 2.5.13(graphql@15.9.0) '@types/draft-js': specifier: ^0.11.18 version: 0.11.18 @@ -797,7 +797,7 @@ importers: devDependencies: '@apollo/client': specifier: ^3.12.2 - version: 3.12.2(@types/react@17.0.75)(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) + version: 3.12.2(@types/react@17.0.75)(graphql@15.9.0)(react-dom@17.0.2)(react@17.0.2) '@babel/cli': specifier: ^7.25.9 version: 7.25.9(@babel/core@7.26.0) @@ -806,22 +806,22 @@ importers: version: 7.26.0 '@comet/admin': specifier: ^7.7.0 - version: 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0 version: 7.7.0(@babel/cli@7.25.9) '@comet/admin-date-time': specifier: ^7.7.0 - version: 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0 version: 7.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@comet/blocks-admin': specifier: ^7.7.0 - version: 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0 - version: 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.9.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.7.0 version: 7.7.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5) @@ -833,7 +833,7 @@ importers: version: 11.11.0(@emotion/react@11.11.3)(@types/react@17.0.75)(react@17.0.2) '@graphql-codegen/cli': specifier: ^2.16.5 - version: 2.16.5(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5) + version: 2.16.5(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.9.0)(typescript@4.9.5) '@mui/icons-material': specifier: ^5.16.8 version: 5.16.8(@mui/material@5.16.7)(@types/react@17.0.75)(react@17.0.2) @@ -871,8 +871,8 @@ importers: specifier: ^4.20.10 version: 4.20.10 graphql: - specifier: ^15.4.0 - version: 15.8.0 + specifier: ^15.9.0 + version: 15.9.0 history: specifier: ^4.10.1 version: 4.10.1 @@ -939,7 +939,7 @@ importers: version: 7.7.0(@nestjs/common@9.4.3) '@comet/cms-api': specifier: ^7.7.0 - version: 7.7.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.21.1)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1) + version: 7.7.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.21.1)(graphql@15.9.0)(nestjs-console@8.0.0)(rxjs@7.8.1) '@comet/eslint-config': specifier: ^7.7.0 version: 7.7.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@29.1.1)(typescript@4.9.5) @@ -969,7 +969,7 @@ importers: version: 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': specifier: ^10.2.1 - version: 10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(graphql@15.8.0)(reflect-metadata@0.1.14) + version: 10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(graphql@15.9.0)(reflect-metadata@0.1.14) '@nestjs/platform-express': specifier: ^9.4.3 version: 9.4.3(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) @@ -1010,8 +1010,8 @@ importers: specifier: ^4.21.1 version: 4.21.1 graphql: - specifier: ^15.5.0 - version: 15.8.0 + specifier: ^15.9.0 + version: 15.9.0 jest: specifier: ^29.7.0 version: 29.7.0(@types/node@18.19.8)(ts-node@10.9.2) @@ -1107,7 +1107,7 @@ packages: - chokidar dev: true - /@apollo/client@3.12.2(@types/react@17.0.75)(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2): + /@apollo/client@3.12.2(@types/react@17.0.75)(graphql@15.9.0)(react-dom@17.0.2)(react@17.0.2): resolution: {integrity: sha512-dkacsdMgVsrrQhLpN4JqZTIEfnNsPVwny+4vccSRqheWZElzUz1Xi0h39p2+TieS1f+wwvyzwpoJEV57vwzT9Q==} peerDependencies: graphql: ^15.0.0 || ^16.0.0 @@ -1125,12 +1125,12 @@ packages: subscriptions-transport-ws: optional: true dependencies: - '@graphql-typed-document-node/core': 3.2.0(graphql@15.8.0) + '@graphql-typed-document-node/core': 3.2.0(graphql@15.9.0) '@wry/caches': 1.0.1 '@wry/equality': 0.5.7 '@wry/trie': 0.5.0 - graphql: 15.8.0 - graphql-tag: 2.12.6(graphql@15.8.0) + graphql: 15.9.0 + graphql-tag: 2.12.6(graphql@15.9.0) hoist-non-react-statics: 3.3.2 optimism: 0.18.0 prop-types: 15.8.1 @@ -1190,13 +1190,13 @@ packages: '@apollo/protobufjs': 1.2.7 dev: false - /@apollo/utils.dropunuseddefinitions@1.1.0(graphql@15.8.0): + /@apollo/utils.dropunuseddefinitions@1.1.0(graphql@15.9.0): resolution: {integrity: sha512-jU1XjMr6ec9pPoL+BFWzEPW7VHHulVdGKMkPAMiCigpVIT11VmCbnij0bWob8uS3ODJ65tZLYKAh/55vLw2rbg==} engines: {node: '>=12.13.0'} peerDependencies: graphql: 14.x || 15.x || 16.x dependencies: - graphql: 15.8.0 + graphql: 15.9.0 dev: false /@apollo/utils.keyvaluecache@1.0.2: @@ -1210,65 +1210,65 @@ packages: resolution: {integrity: sha512-XdlzoY7fYNK4OIcvMD2G94RoFZbzTQaNP0jozmqqMudmaGo2I/2Jx71xlDJ801mWA/mbYRihyaw6KJii7k5RVA==} dev: false - /@apollo/utils.printwithreducedwhitespace@1.1.0(graphql@15.8.0): + /@apollo/utils.printwithreducedwhitespace@1.1.0(graphql@15.9.0): resolution: {integrity: sha512-GfFSkAv3n1toDZ4V6u2d7L4xMwLA+lv+6hqXicMN9KELSJ9yy9RzuEXaX73c/Ry+GzRsBy/fdSUGayGqdHfT2Q==} engines: {node: '>=12.13.0'} peerDependencies: graphql: 14.x || 15.x || 16.x dependencies: - graphql: 15.8.0 + graphql: 15.9.0 dev: false - /@apollo/utils.removealiases@1.0.0(graphql@15.8.0): + /@apollo/utils.removealiases@1.0.0(graphql@15.9.0): resolution: {integrity: sha512-6cM8sEOJW2LaGjL/0vHV0GtRaSekrPQR4DiywaApQlL9EdROASZU5PsQibe2MWeZCOhNrPRuHh4wDMwPsWTn8A==} engines: {node: '>=12.13.0'} peerDependencies: graphql: 14.x || 15.x || 16.x dependencies: - graphql: 15.8.0 + graphql: 15.9.0 dev: false - /@apollo/utils.sortast@1.1.0(graphql@15.8.0): + /@apollo/utils.sortast@1.1.0(graphql@15.9.0): resolution: {integrity: sha512-VPlTsmUnOwzPK5yGZENN069y6uUHgeiSlpEhRnLFYwYNoJHsuJq2vXVwIaSmts015WTPa2fpz1inkLYByeuRQA==} engines: {node: '>=12.13.0'} peerDependencies: graphql: 14.x || 15.x || 16.x dependencies: - graphql: 15.8.0 + graphql: 15.9.0 lodash.sortby: 4.7.0 dev: false - /@apollo/utils.stripsensitiveliterals@1.2.0(graphql@15.8.0): + /@apollo/utils.stripsensitiveliterals@1.2.0(graphql@15.9.0): resolution: {integrity: sha512-E41rDUzkz/cdikM5147d8nfCFVKovXxKBcjvLEQ7bjZm/cg9zEcXvS6vFY8ugTubI3fn6zoqo0CyU8zT+BGP9w==} engines: {node: '>=12.13.0'} peerDependencies: graphql: 14.x || 15.x || 16.x dependencies: - graphql: 15.8.0 + graphql: 15.9.0 dev: false - /@apollo/utils.usagereporting@1.0.1(graphql@15.8.0): + /@apollo/utils.usagereporting@1.0.1(graphql@15.9.0): resolution: {integrity: sha512-6dk+0hZlnDbahDBB2mP/PZ5ybrtCJdLMbeNJD+TJpKyZmSY6bA3SjI8Cr2EM9QA+AdziywuWg+SgbWUF3/zQqQ==} engines: {node: '>=12.13.0'} peerDependencies: graphql: 14.x || 15.x || 16.x dependencies: '@apollo/usage-reporting-protobuf': 4.1.1 - '@apollo/utils.dropunuseddefinitions': 1.1.0(graphql@15.8.0) - '@apollo/utils.printwithreducedwhitespace': 1.1.0(graphql@15.8.0) - '@apollo/utils.removealiases': 1.0.0(graphql@15.8.0) - '@apollo/utils.sortast': 1.1.0(graphql@15.8.0) - '@apollo/utils.stripsensitiveliterals': 1.2.0(graphql@15.8.0) - graphql: 15.8.0 + '@apollo/utils.dropunuseddefinitions': 1.1.0(graphql@15.9.0) + '@apollo/utils.printwithreducedwhitespace': 1.1.0(graphql@15.9.0) + '@apollo/utils.removealiases': 1.0.0(graphql@15.9.0) + '@apollo/utils.sortast': 1.1.0(graphql@15.9.0) + '@apollo/utils.stripsensitiveliterals': 1.2.0(graphql@15.9.0) + graphql: 15.9.0 dev: false - /@apollographql/apollo-tools@0.5.4(graphql@15.8.0): + /@apollographql/apollo-tools@0.5.4(graphql@15.9.0): resolution: {integrity: sha512-shM3q7rUbNyXVVRkQJQseXv6bnYM3BUma/eZhwXR4xsuM+bqWnJKvW7SAfRjP7LuSCocrexa5AXhjjawNHrIlw==} engines: {node: '>=8', npm: '>=6'} peerDependencies: graphql: ^14.2.1 || ^15.0.0 || ^16.0.0 dependencies: - graphql: 15.8.0 + graphql: 15.9.0 dev: false /@apollographql/graphql-playground-html@1.6.29: @@ -1284,7 +1284,7 @@ packages: tslib: 2.0.3 dev: true - /@ardatan/relay-compiler@12.0.0(graphql@15.8.0): + /@ardatan/relay-compiler@12.0.0(graphql@15.9.0): resolution: {integrity: sha512-9anThAaj1dQr6IGmzBMcfzOQKTa5artjuPmw8NYK/fiGEMjADbSguBY2FMDykt+QhilR3wc9VA/3yVju7JHg7Q==} hasBin: true peerDependencies: @@ -1301,7 +1301,7 @@ packages: fb-watchman: 2.0.2 fbjs: 3.0.5 glob: 7.2.3 - graphql: 15.8.0 + graphql: 15.9.0 immutable: 3.7.6 invariant: 2.2.4 nullthrows: 1.1.1 @@ -3831,7 +3831,7 @@ packages: - supports-color dev: true - /@comet/admin-date-time@7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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-btbHQFz4Suwiur4dn9eXljY+zD/0B2xTeGnECpnixVrCCRqzflmFmPMDSVZjXv4j/npoBTEcKPhgShozvP7myQ==} peerDependencies: '@mui/material': ^5.0.0 @@ -3840,7 +3840,7 @@ packages: react-final-form: ^6.5.7 react-intl: ^5.0.0 || ^6.0.0 dependencies: - '@comet/admin': 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.16.7(@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) @@ -3880,7 +3880,7 @@ packages: use-constant: 1.1.1(react@17.0.2) uuid: 9.0.1 - /@comet/admin-rte@7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.9.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-ic6Xu/J6YUcz6DgO6J/AKMCxLLjjBS3cteVSuQMKMMkxMiAezoUhGtFUvLd1GH/ST57aE4wwB4pdPVItWTgaig==} peerDependencies: '@mui/material': ^5.0.0 @@ -3891,7 +3891,7 @@ packages: react-final-form: ^6.3.1 react-intl: ^5.0.0 || ^6.0.0 dependencies: - '@comet/admin': 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.16.7(@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 @@ -3936,7 +3936,7 @@ packages: - '@types/react' - react-dom - /@comet/admin@7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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-CXw8EgFjbRaIUdEKdBjbSOHY4GyTxqqe4ZxSyvgwosrpG6t0eD/4sknvSEwQMSPVl3FsJzeuoQkDj8yX0f/YDQ==} peerDependencies: '@apollo/client': ^3.7.0 @@ -3964,7 +3964,7 @@ packages: react-dnd: optional: true dependencies: - '@apollo/client': 3.12.2(@types/react@17.0.75)(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) + '@apollo/client': 3.12.2(@types/react@17.0.75)(graphql@15.9.0)(react-dom@17.0.2)(react@17.0.2) '@comet/admin-icons': 7.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@comet/admin-theme': 7.7.0(@mui/material@5.16.7)(@mui/system@5.16.7)(@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) @@ -3978,7 +3978,7 @@ packages: file-saver: 2.0.5 final-form: 4.20.10 final-form-set-field-data: 1.0.2(final-form@4.20.10) - graphql: 15.8.0 + graphql: 15.9.0 history: 4.10.1 http-status-codes: 2.3.0 is-mobile: 4.0.0 @@ -3999,7 +3999,7 @@ packages: - '@mui/system' - '@types/react' - /@comet/blocks-admin@7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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-J2IJccacYuiJSehTEfeV4hKTTQtl8HvPF8+BwFAItxNirTBi5arSb73Gcg3W2bawi1mf0uHtFE39SMK+Kn+58g==} peerDependencies: '@mui/material': ^5.0.0 @@ -4011,7 +4011,7 @@ packages: react-router: ^5.0.0 react-router-dom: ^5.0.0 dependencies: - '@comet/admin': 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@mui/lab': 5.0.0-alpha.173(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.16.7(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) @@ -4062,7 +4062,7 @@ packages: ts-node: 10.9.2(@types/node@18.19.8)(typescript@4.9.5) dev: true - /@comet/cms-admin@7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.9.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-FARsHyD2+c6ba1yObRG4yosJ7eJPT1Tnx6vLrdriCcsy6T5rGZLr1oJKT5rNKkb/Yw+SbNXrqEvIes+8jpBVHw==} hasBin: true peerDependencies: @@ -4082,18 +4082,18 @@ packages: react-router: ^5.0.0 react-router-dom: ^5.0.0 dependencies: - '@apollo/client': 3.12.2(@types/react@17.0.75)(graphql@15.8.0)(react-dom@17.0.2)(react@17.0.2) - '@comet/admin': 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.12.2(@types/react@17.0.75)(graphql@15.9.0)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin': 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) - '@comet/admin-rte': 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.9.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.7.0(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) - '@comet/blocks-admin': 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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) + '@graphql-tools/graphql-file-loader': 7.5.17(graphql@15.9.0) + '@graphql-tools/load': 7.8.14(graphql@15.9.0) + '@graphql-typed-document-node/core': 3.2.0(graphql@15.9.0) '@mui/lab': 5.0.0-alpha.173(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.16.7(@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/x-data-grid': 5.17.26(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) @@ -4107,8 +4107,8 @@ packages: final-form: 4.20.10 final-form-arrays: 3.1.0(final-form@4.20.10) final-form-set-field-touched: 1.0.1(final-form@4.20.10) - graphql: 15.8.0 - graphql-tag: 2.12.6(graphql@15.8.0) + graphql: 15.9.0 + graphql-tag: 2.12.6(graphql@15.9.0) js-cookie: 3.0.5 lodash.clonedeep: 4.5.0 lodash.escaperegexp: 4.1.2 @@ -4150,7 +4150,7 @@ packages: - draft-js - history - /@comet/cms-api@7.7.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.21.1)(graphql@15.8.0)(nestjs-console@8.0.0)(rxjs@7.8.1): + /@comet/cms-api@7.7.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.21.1)(graphql@15.9.0)(nestjs-console@8.0.0)(rxjs@7.8.1): resolution: {integrity: sha512-Sx92DWQuZmGcYbh147FF+TTW+mO6M115rDez70mEPJFHWaKbjcJGyzxJht048TsBLmnpSL9wBBg31ILKVogl+w==} hasBin: true peerDependencies: @@ -4187,7 +4187,7 @@ packages: '@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.6)(class-transformer@0.5.1)(class-validator@0.14.1)(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.14.1)(graphql@15.8.0)(reflect-metadata@0.1.14) + '@nestjs/graphql': 10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(graphql@15.9.0)(reflect-metadata@0.1.14) '@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) @@ -4208,9 +4208,9 @@ packages: file-type: 16.5.4 get-image-colors: 4.0.1 got: 11.8.6 - graphql: 15.8.0 - graphql-parse-resolve-info: 4.13.0(graphql@15.8.0) - graphql-scalars: 1.23.0(graphql@15.8.0) + graphql: 15.9.0 + graphql-parse-resolve-info: 4.13.0(graphql@15.9.0) + graphql-scalars: 1.23.0(graphql@15.9.0) hasha: 5.2.2 jose: 5.9.6 jsonwebtoken: 8.5.1 @@ -4894,17 +4894,17 @@ packages: '@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) lodash: 4.17.21 - /@graphql-codegen/add@3.2.3(graphql@15.8.0): + /@graphql-codegen/add@3.2.3(graphql@15.9.0): resolution: {integrity: sha512-sQOnWpMko4JLeykwyjFTxnhqjd/3NOG2OyMuvK76Wnnwh8DRrNf2VEs2kmSvLl7MndMlOj7Kh5U154dVcvhmKQ==} peerDependencies: 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-codegen/plugin-helpers': 3.1.2(graphql@15.8.0) - graphql: 15.8.0 + '@graphql-codegen/plugin-helpers': 3.1.2(graphql@15.9.0) + graphql: 15.9.0 tslib: 2.4.1 dev: true - /@graphql-codegen/cli@2.16.5(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.8.0)(typescript@4.9.5): + /@graphql-codegen/cli@2.16.5(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.9.0)(typescript@4.9.5): resolution: {integrity: sha512-XYPIp+q7fB0xAGSAoRykiTe4oY80VU+z+dw5nuv4mLY0+pv7+pa2C6Nwhdw7a65lXOhFviBApWCCZeqd54SMnA==} hasBin: true peerDependencies: @@ -4913,18 +4913,18 @@ packages: '@babel/generator': 7.23.6 '@babel/template': 7.22.15 '@babel/types': 7.23.6 - '@graphql-codegen/core': 2.6.8(graphql@15.8.0) - '@graphql-codegen/plugin-helpers': 3.1.2(graphql@15.8.0) - '@graphql-tools/apollo-engine-loader': 7.3.26(graphql@15.8.0) - '@graphql-tools/code-file-loader': 7.3.23(@babel/core@7.26.0)(graphql@15.8.0) - '@graphql-tools/git-loader': 7.3.0(@babel/core@7.26.0)(graphql@15.8.0) - '@graphql-tools/github-loader': 7.3.28(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.8.0) - '@graphql-tools/graphql-file-loader': 7.5.17(graphql@15.8.0) - '@graphql-tools/json-file-loader': 7.4.18(graphql@15.8.0) - '@graphql-tools/load': 7.8.14(graphql@15.8.0) - '@graphql-tools/prisma-loader': 7.2.72(@types/node@18.19.8)(graphql@15.8.0) - '@graphql-tools/url-loader': 7.17.18(@types/node@18.19.8)(graphql@15.8.0) - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) + '@graphql-codegen/core': 2.6.8(graphql@15.9.0) + '@graphql-codegen/plugin-helpers': 3.1.2(graphql@15.9.0) + '@graphql-tools/apollo-engine-loader': 7.3.26(graphql@15.9.0) + '@graphql-tools/code-file-loader': 7.3.23(@babel/core@7.26.0)(graphql@15.9.0) + '@graphql-tools/git-loader': 7.3.0(@babel/core@7.26.0)(graphql@15.9.0) + '@graphql-tools/github-loader': 7.3.28(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.9.0) + '@graphql-tools/graphql-file-loader': 7.5.17(graphql@15.9.0) + '@graphql-tools/json-file-loader': 7.4.18(graphql@15.9.0) + '@graphql-tools/load': 7.8.14(graphql@15.9.0) + '@graphql-tools/prisma-loader': 7.2.72(@types/node@18.19.8)(graphql@15.9.0) + '@graphql-tools/url-loader': 7.17.18(@types/node@18.19.8)(graphql@15.9.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) '@whatwg-node/fetch': 0.6.9(@types/node@18.19.8) chalk: 4.1.2 chokidar: 3.5.3 @@ -4932,8 +4932,8 @@ packages: cosmiconfig-typescript-loader: 4.4.0(@types/node@18.19.8)(cosmiconfig@7.1.0)(ts-node@10.9.2)(typescript@4.9.5) debounce: 1.2.1 detect-indent: 6.1.0 - graphql: 15.8.0 - graphql-config: 4.5.0(@types/node@18.19.8)(graphql@15.8.0) + graphql: 15.9.0 + graphql-config: 4.5.0(@types/node@18.19.8)(graphql@15.9.0) inquirer: 8.2.6 is-glob: 4.0.3 json-to-pretty-yaml: 1.2.2 @@ -4960,65 +4960,65 @@ packages: - utf-8-validate dev: true - /@graphql-codegen/core@2.6.8(graphql@15.8.0): + /@graphql-codegen/core@2.6.8(graphql@15.9.0): resolution: {integrity: sha512-JKllNIipPrheRgl+/Hm/xuWMw9++xNQ12XJR/OHHgFopOg4zmN3TdlRSyYcv/K90hCFkkIwhlHFUQTfKrm8rxQ==} peerDependencies: 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-codegen/plugin-helpers': 3.1.2(graphql@15.8.0) - '@graphql-tools/schema': 9.0.19(graphql@15.8.0) - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) - graphql: 15.8.0 + '@graphql-codegen/plugin-helpers': 3.1.2(graphql@15.9.0) + '@graphql-tools/schema': 9.0.19(graphql@15.9.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) + graphql: 15.9.0 tslib: 2.4.1 dev: true - /@graphql-codegen/fragment-matcher@2.0.1(graphql@15.8.0): + /@graphql-codegen/fragment-matcher@2.0.1(graphql@15.9.0): resolution: {integrity: sha512-CUHmeunK2xz9P5XBOPYeJwuQCa/7YnwmXJzuLMs+6fKa43KlFTTmpzYHh4p4Hx2lHAsZUpuWSD9/KSptvSG4aA==} peerDependencies: 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 dependencies: - '@graphql-codegen/plugin-helpers': 1.18.8(graphql@15.8.0) - graphql: 15.8.0 + '@graphql-codegen/plugin-helpers': 1.18.8(graphql@15.9.0) + graphql: 15.9.0 tslib: 2.0.3 dev: true - /@graphql-codegen/introspection@2.2.3(graphql@15.8.0): + /@graphql-codegen/introspection@2.2.3(graphql@15.9.0): resolution: {integrity: sha512-iS0xhy64lapGCsBIBKFpAcymGW+A0LiLSGP9dPl6opZwU1bm/rsahkKvJnc+oCI/xfdQ3Q33zgUKOSCkqmM4Bw==} peerDependencies: 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-codegen/plugin-helpers': 3.1.2(graphql@15.8.0) - '@graphql-codegen/visitor-plugin-common': 2.13.8(graphql@15.8.0) - graphql: 15.8.0 + '@graphql-codegen/plugin-helpers': 3.1.2(graphql@15.9.0) + '@graphql-codegen/visitor-plugin-common': 2.13.8(graphql@15.9.0) + graphql: 15.9.0 tslib: 2.4.1 transitivePeerDependencies: - encoding - supports-color dev: true - /@graphql-codegen/named-operations-object@2.3.1(graphql-tag@2.12.6)(graphql@15.8.0): + /@graphql-codegen/named-operations-object@2.3.1(graphql-tag@2.12.6)(graphql@15.9.0): resolution: {integrity: sha512-RVjt+1CbVzFUsWerWZaywkYJexeccwDYtPotnZODCem7fTkdBbto6q82jhXRMbsknnjRx/yeFlVkaG9PqrBZZw==} peerDependencies: 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 graphql-tag: ^2.0.0 dependencies: - '@graphql-codegen/plugin-helpers': 2.7.2(graphql@15.8.0) + '@graphql-codegen/plugin-helpers': 2.7.2(graphql@15.9.0) change-case-all: 1.0.14 - graphql: 15.8.0 - graphql-tag: 2.12.6(graphql@15.8.0) + graphql: 15.9.0 + graphql-tag: 2.12.6(graphql@15.9.0) tslib: 2.4.1 dev: true - /@graphql-codegen/near-operation-file-preset@2.5.0(graphql@15.8.0): + /@graphql-codegen/near-operation-file-preset@2.5.0(graphql@15.9.0): resolution: {integrity: sha512-S9PNJP5tTkUWBQ6inbviOsTREzsMxYVqJGrtPcIdMWkKLZAAItAfAb60klB1T64vt6Oru+nUf8IYUNrchJ8MYg==} peerDependencies: 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-codegen/add': 3.2.3(graphql@15.8.0) - '@graphql-codegen/plugin-helpers': 2.7.2(graphql@15.8.0) - '@graphql-codegen/visitor-plugin-common': 2.13.1(graphql@15.8.0) - '@graphql-tools/utils': 8.13.1(graphql@15.8.0) - graphql: 15.8.0 + '@graphql-codegen/add': 3.2.3(graphql@15.9.0) + '@graphql-codegen/plugin-helpers': 2.7.2(graphql@15.9.0) + '@graphql-codegen/visitor-plugin-common': 2.13.1(graphql@15.9.0) + '@graphql-tools/utils': 8.13.1(graphql@15.9.0) + graphql: 15.9.0 parse-filepath: 1.0.2 tslib: 2.4.1 transitivePeerDependencies: @@ -5026,104 +5026,104 @@ packages: - supports-color dev: true - /@graphql-codegen/plugin-helpers@1.18.8(graphql@15.8.0): + /@graphql-codegen/plugin-helpers@1.18.8(graphql@15.9.0): resolution: {integrity: sha512-mb4I9j9lMGqvGggYuZ0CV+Hme08nar68xkpPbAVotg/ZBmlhZIok/HqW2BcMQi7Rj+Il5HQMeQ1wQ1M7sv/TlQ==} peerDependencies: 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 dependencies: - '@graphql-tools/utils': 7.10.0(graphql@15.8.0) + '@graphql-tools/utils': 7.10.0(graphql@15.9.0) common-tags: 1.8.0 - graphql: 15.8.0 + graphql: 15.9.0 import-from: 4.0.0 lodash: 4.17.21 tslib: 2.3.1 dev: true - /@graphql-codegen/plugin-helpers@2.7.2(graphql@15.8.0): + /@graphql-codegen/plugin-helpers@2.7.2(graphql@15.9.0): resolution: {integrity: sha512-kln2AZ12uii6U59OQXdjLk5nOlh1pHis1R98cDZGFnfaiAbX9V3fxcZ1MMJkB7qFUymTALzyjZoXXdyVmPMfRg==} peerDependencies: 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-tools/utils': 8.13.1(graphql@15.8.0) + '@graphql-tools/utils': 8.13.1(graphql@15.9.0) change-case-all: 1.0.14 common-tags: 1.8.2 - graphql: 15.8.0 + graphql: 15.9.0 import-from: 4.0.0 lodash: 4.17.21 tslib: 2.4.1 dev: true - /@graphql-codegen/plugin-helpers@3.1.2(graphql@15.8.0): + /@graphql-codegen/plugin-helpers@3.1.2(graphql@15.9.0): resolution: {integrity: sha512-emOQiHyIliVOIjKVKdsI5MXj312zmRDwmHpyUTZMjfpvxq/UVAHUJIVdVf+lnjjrI+LXBTgMlTWTgHQfmICxjg==} peerDependencies: 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-tools/utils': 9.2.1(graphql@15.8.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) change-case-all: 1.0.15 common-tags: 1.8.2 - graphql: 15.8.0 + graphql: 15.9.0 import-from: 4.0.0 lodash: 4.17.21 tslib: 2.4.1 dev: true - /@graphql-codegen/schema-ast@2.6.1(graphql@15.8.0): + /@graphql-codegen/schema-ast@2.6.1(graphql@15.9.0): resolution: {integrity: sha512-5TNW3b1IHJjCh07D2yQNGDQzUpUl2AD+GVe1Dzjqyx/d2Fn0TPMxLsHsKPS4Plg4saO8FK/QO70wLsP7fdbQ1w==} peerDependencies: 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-codegen/plugin-helpers': 3.1.2(graphql@15.8.0) - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) - graphql: 15.8.0 + '@graphql-codegen/plugin-helpers': 3.1.2(graphql@15.9.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) + graphql: 15.9.0 tslib: 2.4.1 dev: true - /@graphql-codegen/typescript-operations@2.5.13(graphql@15.8.0): + /@graphql-codegen/typescript-operations@2.5.13(graphql@15.9.0): resolution: {integrity: sha512-3vfR6Rx6iZU0JRt29GBkFlrSNTM6t+MSLF86ChvL4d/Jfo/JYAGuB3zNzPhirHYzJPCvLOAx2gy9ID1ltrpYiw==} peerDependencies: 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-codegen/plugin-helpers': 3.1.2(graphql@15.8.0) - '@graphql-codegen/typescript': 2.8.8(graphql@15.8.0) - '@graphql-codegen/visitor-plugin-common': 2.13.8(graphql@15.8.0) + '@graphql-codegen/plugin-helpers': 3.1.2(graphql@15.9.0) + '@graphql-codegen/typescript': 2.8.8(graphql@15.9.0) + '@graphql-codegen/visitor-plugin-common': 2.13.8(graphql@15.9.0) auto-bind: 4.0.0 - graphql: 15.8.0 + graphql: 15.9.0 tslib: 2.4.1 transitivePeerDependencies: - encoding - supports-color dev: true - /@graphql-codegen/typescript@2.8.8(graphql@15.8.0): + /@graphql-codegen/typescript@2.8.8(graphql@15.9.0): resolution: {integrity: sha512-A0oUi3Oy6+DormOlrTC4orxT9OBZkIglhbJBcDmk34jAKKUgesukXRd4yOhmTrnbchpXz2T8IAOFB3FWIaK4Rw==} peerDependencies: graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 dependencies: - '@graphql-codegen/plugin-helpers': 3.1.2(graphql@15.8.0) - '@graphql-codegen/schema-ast': 2.6.1(graphql@15.8.0) - '@graphql-codegen/visitor-plugin-common': 2.13.8(graphql@15.8.0) + '@graphql-codegen/plugin-helpers': 3.1.2(graphql@15.9.0) + '@graphql-codegen/schema-ast': 2.6.1(graphql@15.9.0) + '@graphql-codegen/visitor-plugin-common': 2.13.8(graphql@15.9.0) auto-bind: 4.0.0 - graphql: 15.8.0 + graphql: 15.9.0 tslib: 2.4.1 transitivePeerDependencies: - encoding - supports-color dev: true - /@graphql-codegen/visitor-plugin-common@2.13.1(graphql@15.8.0): + /@graphql-codegen/visitor-plugin-common@2.13.1(graphql@15.9.0): resolution: {integrity: sha512-mD9ufZhDGhyrSaWQGrU1Q1c5f01TeWtSWy/cDwXYjJcHIj1Y/DG2x0tOflEfCvh5WcnmHNIw4lzDsg1W7iFJEg==} peerDependencies: 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-codegen/plugin-helpers': 2.7.2(graphql@15.8.0) - '@graphql-tools/optimize': 1.4.0(graphql@15.8.0) - '@graphql-tools/relay-operation-optimizer': 6.5.18(graphql@15.8.0) - '@graphql-tools/utils': 8.13.1(graphql@15.8.0) + '@graphql-codegen/plugin-helpers': 2.7.2(graphql@15.9.0) + '@graphql-tools/optimize': 1.4.0(graphql@15.9.0) + '@graphql-tools/relay-operation-optimizer': 6.5.18(graphql@15.9.0) + '@graphql-tools/utils': 8.13.1(graphql@15.9.0) auto-bind: 4.0.0 change-case-all: 1.0.14 dependency-graph: 0.11.0 - graphql: 15.8.0 - graphql-tag: 2.12.6(graphql@15.8.0) + graphql: 15.9.0 + graphql-tag: 2.12.6(graphql@15.9.0) parse-filepath: 1.0.2 tslib: 2.4.1 transitivePeerDependencies: @@ -5131,20 +5131,20 @@ packages: - supports-color dev: true - /@graphql-codegen/visitor-plugin-common@2.13.8(graphql@15.8.0): + /@graphql-codegen/visitor-plugin-common@2.13.8(graphql@15.9.0): resolution: {integrity: sha512-IQWu99YV4wt8hGxIbBQPtqRuaWZhkQRG2IZKbMoSvh0vGeWb3dB0n0hSgKaOOxDY+tljtOf9MTcUYvJslQucMQ==} peerDependencies: 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-codegen/plugin-helpers': 3.1.2(graphql@15.8.0) - '@graphql-tools/optimize': 1.4.0(graphql@15.8.0) - '@graphql-tools/relay-operation-optimizer': 6.5.18(graphql@15.8.0) - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) + '@graphql-codegen/plugin-helpers': 3.1.2(graphql@15.9.0) + '@graphql-tools/optimize': 1.4.0(graphql@15.9.0) + '@graphql-tools/relay-operation-optimizer': 6.5.18(graphql@15.9.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) auto-bind: 4.0.0 change-case-all: 1.0.15 dependency-graph: 0.11.0 - graphql: 15.8.0 - graphql-tag: 2.12.6(graphql@15.8.0) + graphql: 15.9.0 + graphql-tag: 2.12.6(graphql@15.9.0) parse-filepath: 1.0.2 tslib: 2.4.1 transitivePeerDependencies: @@ -5152,41 +5152,41 @@ packages: - supports-color dev: true - /@graphql-tools/apollo-engine-loader@7.3.26(graphql@15.8.0): + /@graphql-tools/apollo-engine-loader@7.3.26(graphql@15.9.0): resolution: {integrity: sha512-h1vfhdJFjnCYn9b5EY1Z91JTF0KB3hHVJNQIsiUV2mpQXZdeOXQoaWeYEKaiI5R6kwBw5PP9B0fv3jfUIG8LyQ==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: '@ardatan/sync-fetch': 0.0.1 - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) '@whatwg-node/fetch': 0.8.8 - graphql: 15.8.0 + graphql: 15.9.0 tslib: 2.8.1 transitivePeerDependencies: - encoding dev: true - /@graphql-tools/batch-execute@8.5.22(graphql@15.8.0): + /@graphql-tools/batch-execute@8.5.22(graphql@15.9.0): resolution: {integrity: sha512-hcV1JaY6NJQFQEwCKrYhpfLK8frSXDbtNMoTur98u10Cmecy1zrqNKSqhEyGetpgHxaJRqszGzKeI3RuroDN6A==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) dataloader: 2.2.2 - graphql: 15.8.0 + graphql: 15.9.0 tslib: 2.8.1 value-or-promise: 1.0.12 dev: true - /@graphql-tools/code-file-loader@7.3.23(@babel/core@7.26.0)(graphql@15.8.0): + /@graphql-tools/code-file-loader@7.3.23(@babel/core@7.26.0)(graphql@15.9.0): resolution: {integrity: sha512-8Wt1rTtyTEs0p47uzsPJ1vAtfAx0jmxPifiNdmo9EOCuUPyQGEbMaik/YkqZ7QUFIEYEQu+Vgfo8tElwOPtx5Q==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/graphql-tag-pluck': 7.5.2(@babel/core@7.26.0)(graphql@15.8.0) - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) + '@graphql-tools/graphql-tag-pluck': 7.5.2(@babel/core@7.26.0)(graphql@15.9.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) globby: 11.1.0 - graphql: 15.8.0 + graphql: 15.9.0 tslib: 2.8.1 unixify: 1.0.0 transitivePeerDependencies: @@ -5194,31 +5194,31 @@ packages: - supports-color dev: true - /@graphql-tools/delegate@9.0.35(graphql@15.8.0): + /@graphql-tools/delegate@9.0.35(graphql@15.9.0): resolution: {integrity: sha512-jwPu8NJbzRRMqi4Vp/5QX1vIUeUPpWmlQpOkXQD2r1X45YsVceyUUBnktCrlJlDB4jPRVy7JQGwmYo3KFiOBMA==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/batch-execute': 8.5.22(graphql@15.8.0) - '@graphql-tools/executor': 0.0.20(graphql@15.8.0) - '@graphql-tools/schema': 9.0.19(graphql@15.8.0) - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) + '@graphql-tools/batch-execute': 8.5.22(graphql@15.9.0) + '@graphql-tools/executor': 0.0.20(graphql@15.9.0) + '@graphql-tools/schema': 9.0.19(graphql@15.9.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) dataloader: 2.2.2 - graphql: 15.8.0 + graphql: 15.9.0 tslib: 2.8.1 value-or-promise: 1.0.12 dev: true - /@graphql-tools/executor-graphql-ws@0.0.14(graphql@15.8.0): + /@graphql-tools/executor-graphql-ws@0.0.14(graphql@15.9.0): resolution: {integrity: sha512-P2nlkAsPZKLIXImFhj0YTtny5NQVGSsKnhi7PzXiaHSXc6KkzqbWZHKvikD4PObanqg+7IO58rKFpGXP7eeO+w==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) '@repeaterjs/repeater': 3.0.4 '@types/ws': 8.5.10 - graphql: 15.8.0 - graphql-ws: 5.12.1(graphql@15.8.0) + graphql: 15.9.0 + graphql-ws: 5.12.1(graphql@15.9.0) isomorphic-ws: 5.0.0(ws@8.13.0) tslib: 2.8.1 ws: 8.13.0 @@ -5227,17 +5227,17 @@ packages: - utf-8-validate dev: true - /@graphql-tools/executor-http@0.1.10(@types/node@18.19.8)(graphql@15.8.0): + /@graphql-tools/executor-http@0.1.10(@types/node@18.19.8)(graphql@15.9.0): resolution: {integrity: sha512-hnAfbKv0/lb9s31LhWzawQ5hghBfHS+gYWtqxME6Rl0Aufq9GltiiLBcl7OVVOnkLF0KhwgbYP1mB5VKmgTGpg==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) '@repeaterjs/repeater': 3.0.5 '@whatwg-node/fetch': 0.8.8 dset: 3.1.3 extract-files: 11.0.0 - graphql: 15.8.0 + graphql: 15.9.0 meros: 1.3.0(@types/node@18.19.8) tslib: 2.8.1 value-or-promise: 1.0.12 @@ -5245,14 +5245,14 @@ packages: - '@types/node' dev: true - /@graphql-tools/executor-legacy-ws@0.0.11(graphql@15.8.0): + /@graphql-tools/executor-legacy-ws@0.0.11(graphql@15.9.0): resolution: {integrity: sha512-4ai+NnxlNfvIQ4c70hWFvOZlSUN8lt7yc+ZsrwtNFbFPH/EroIzFMapAxM9zwyv9bH38AdO3TQxZ5zNxgBdvUw==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) '@types/ws': 8.5.10 - graphql: 15.8.0 + graphql: 15.9.0 isomorphic-ws: 5.0.0(ws@8.13.0) tslib: 2.8.1 ws: 8.13.0 @@ -5261,27 +5261,27 @@ packages: - utf-8-validate dev: true - /@graphql-tools/executor@0.0.20(graphql@15.8.0): + /@graphql-tools/executor@0.0.20(graphql@15.9.0): resolution: {integrity: sha512-GdvNc4vszmfeGvUqlcaH1FjBoguvMYzxAfT6tDd4/LgwymepHhinqLNA5otqwVLW+JETcDaK7xGENzFomuE6TA==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) - '@graphql-typed-document-node/core': 3.2.0(graphql@15.8.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) + '@graphql-typed-document-node/core': 3.2.0(graphql@15.9.0) '@repeaterjs/repeater': 3.0.5 - graphql: 15.8.0 + graphql: 15.9.0 tslib: 2.8.1 value-or-promise: 1.0.12 dev: true - /@graphql-tools/git-loader@7.3.0(@babel/core@7.26.0)(graphql@15.8.0): + /@graphql-tools/git-loader@7.3.0(@babel/core@7.26.0)(graphql@15.9.0): resolution: {integrity: sha512-gcGAK+u16eHkwsMYqqghZbmDquh8QaO24Scsxq+cVR+vx1ekRlsEiXvu+yXVDbZdcJ6PBIbeLcQbEu+xhDLmvQ==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/graphql-tag-pluck': 7.5.2(@babel/core@7.26.0)(graphql@15.8.0) - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) - graphql: 15.8.0 + '@graphql-tools/graphql-tag-pluck': 7.5.2(@babel/core@7.26.0)(graphql@15.9.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) + graphql: 15.9.0 is-glob: 4.0.3 micromatch: 4.0.8 tslib: 2.8.1 @@ -5291,17 +5291,17 @@ packages: - supports-color dev: true - /@graphql-tools/github-loader@7.3.28(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.8.0): + /@graphql-tools/github-loader@7.3.28(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.9.0): resolution: {integrity: sha512-OK92Lf9pmxPQvjUNv05b3tnVhw0JRfPqOf15jZjyQ8BfdEUrJoP32b4dRQQem/wyRL24KY4wOfArJNqzpsbwCA==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: '@ardatan/sync-fetch': 0.0.1 - '@graphql-tools/executor-http': 0.1.10(@types/node@18.19.8)(graphql@15.8.0) - '@graphql-tools/graphql-tag-pluck': 7.5.2(@babel/core@7.26.0)(graphql@15.8.0) - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) + '@graphql-tools/executor-http': 0.1.10(@types/node@18.19.8)(graphql@15.9.0) + '@graphql-tools/graphql-tag-pluck': 7.5.2(@babel/core@7.26.0)(graphql@15.9.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) '@whatwg-node/fetch': 0.8.8 - graphql: 15.8.0 + graphql: 15.9.0 tslib: 2.8.1 value-or-promise: 1.0.12 transitivePeerDependencies: @@ -5311,19 +5311,19 @@ packages: - supports-color dev: true - /@graphql-tools/graphql-file-loader@7.5.17(graphql@15.8.0): + /@graphql-tools/graphql-file-loader@7.5.17(graphql@15.9.0): resolution: {integrity: sha512-hVwwxPf41zOYgm4gdaZILCYnKB9Zap7Ys9OhY1hbwuAuC4MMNY9GpUjoTU3CQc3zUiPoYStyRtUGkHSJZ3HxBw==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/import': 6.7.18(graphql@15.8.0) - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) + '@graphql-tools/import': 6.7.18(graphql@15.9.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) globby: 11.1.0 - graphql: 15.8.0 + graphql: 15.9.0 tslib: 2.8.1 unixify: 1.0.0 - /@graphql-tools/graphql-tag-pluck@7.5.2(@babel/core@7.26.0)(graphql@15.8.0): + /@graphql-tools/graphql-tag-pluck@7.5.2(@babel/core@7.26.0)(graphql@15.9.0): resolution: {integrity: sha512-RW+H8FqOOLQw0BPXaahYepVSRjuOHw+7IL8Opaa5G5uYGOBxoXR7DceyQ7BcpMgktAOOmpDNQ2WtcboChOJSRA==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 @@ -5332,111 +5332,111 @@ packages: '@babel/plugin-syntax-import-assertions': 7.23.3(@babel/core@7.26.0) '@babel/traverse': 7.23.7 '@babel/types': 7.23.6 - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) - graphql: 15.8.0 + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) + graphql: 15.9.0 tslib: 2.8.1 transitivePeerDependencies: - '@babel/core' - supports-color dev: true - /@graphql-tools/import@6.7.18(graphql@15.8.0): + /@graphql-tools/import@6.7.18(graphql@15.9.0): resolution: {integrity: sha512-XQDdyZTp+FYmT7as3xRWH/x8dx0QZA2WZqfMF5EWb36a0PiH7WwlRQYIdyYXj8YCLpiWkeBXgBRHmMnwEYR8iQ==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) - graphql: 15.8.0 + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) + graphql: 15.9.0 resolve-from: 5.0.0 tslib: 2.8.1 - /@graphql-tools/json-file-loader@7.4.18(graphql@15.8.0): + /@graphql-tools/json-file-loader@7.4.18(graphql@15.9.0): resolution: {integrity: sha512-AJ1b6Y1wiVgkwsxT5dELXhIVUPs/u3VZ8/0/oOtpcoyO/vAeM5rOvvWegzicOOnQw8G45fgBRMkkRfeuwVt6+w==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) globby: 11.1.0 - graphql: 15.8.0 + graphql: 15.9.0 tslib: 2.8.1 unixify: 1.0.0 dev: true - /@graphql-tools/load@7.8.14(graphql@15.8.0): + /@graphql-tools/load@7.8.14(graphql@15.9.0): resolution: {integrity: sha512-ASQvP+snHMYm+FhIaLxxFgVdRaM0vrN9wW2BKInQpktwWTXVyk+yP5nQUCEGmn0RTdlPKrffBaigxepkEAJPrg==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/schema': 9.0.19(graphql@15.8.0) - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) - graphql: 15.8.0 + '@graphql-tools/schema': 9.0.19(graphql@15.9.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) + graphql: 15.9.0 p-limit: 3.1.0 tslib: 2.8.1 - /@graphql-tools/merge@8.3.1(graphql@15.8.0): + /@graphql-tools/merge@8.3.1(graphql@15.9.0): resolution: {integrity: sha512-BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/utils': 8.9.0(graphql@15.8.0) - graphql: 15.8.0 + '@graphql-tools/utils': 8.9.0(graphql@15.9.0) + graphql: 15.9.0 tslib: 2.8.1 dev: false - /@graphql-tools/merge@8.3.18(graphql@15.8.0): + /@graphql-tools/merge@8.3.18(graphql@15.9.0): resolution: {integrity: sha512-R8nBglvRWPAyLpZL/f3lxsY7wjnAeE0l056zHhcO/CgpvK76KYUt9oEkR05i8Hmt8DLRycBN0FiotJ0yDQWTVA==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) - graphql: 15.8.0 + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) + graphql: 15.9.0 tslib: 2.8.1 - /@graphql-tools/merge@8.4.2(graphql@15.8.0): + /@graphql-tools/merge@8.4.2(graphql@15.9.0): resolution: {integrity: sha512-XbrHAaj8yDuINph+sAfuq3QCZ/tKblrTLOpirK0+CAgNlZUCHs0Fa+xtMUURgwCVThLle1AF7svJCxFizygLsw==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) - graphql: 15.8.0 + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) + graphql: 15.9.0 tslib: 2.8.1 - /@graphql-tools/mock@8.7.20(graphql@15.8.0): + /@graphql-tools/mock@8.7.20(graphql@15.9.0): resolution: {integrity: sha512-ljcHSJWjC/ZyzpXd5cfNhPI7YljRVvabKHPzKjEs5ElxWu2cdlLGvyNYepApXDsM/OJG/2xuhGM+9GWu5gEAPQ==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/schema': 9.0.19(graphql@15.8.0) - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) + '@graphql-tools/schema': 9.0.19(graphql@15.9.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) fast-json-stable-stringify: 2.1.0 - graphql: 15.8.0 + graphql: 15.9.0 tslib: 2.8.1 dev: false - /@graphql-tools/optimize@1.4.0(graphql@15.8.0): + /@graphql-tools/optimize@1.4.0(graphql@15.9.0): resolution: {integrity: sha512-dJs/2XvZp+wgHH8T5J2TqptT9/6uVzIYvA6uFACha+ufvdMBedkfR4b4GbT8jAKLRARiqRTxy3dctnwkTM2tdw==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - graphql: 15.8.0 + graphql: 15.9.0 tslib: 2.8.1 dev: true - /@graphql-tools/prisma-loader@7.2.72(@types/node@18.19.8)(graphql@15.8.0): + /@graphql-tools/prisma-loader@7.2.72(@types/node@18.19.8)(graphql@15.9.0): resolution: {integrity: sha512-0a7uV7Fky6yDqd0tI9+XMuvgIo6GAqiVzzzFV4OSLry4AwiQlI3igYseBV7ZVOGhedOTqj/URxjpiv07hRcwag==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/url-loader': 7.17.18(@types/node@18.19.8)(graphql@15.8.0) - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) + '@graphql-tools/url-loader': 7.17.18(@types/node@18.19.8)(graphql@15.9.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) '@types/js-yaml': 4.0.9 '@types/json-stable-stringify': 1.0.36 '@whatwg-node/fetch': 0.8.8 chalk: 4.1.2 debug: 4.3.7(supports-color@9.4.0) dotenv: 16.4.5 - graphql: 15.8.0 - graphql-request: 6.1.0(graphql@15.8.0) + graphql: 15.9.0 + graphql-request: 6.1.0(graphql@15.9.0) http-proxy-agent: 6.1.1 https-proxy-agent: 6.2.1 jose: 4.15.9 @@ -5454,69 +5454,69 @@ packages: - utf-8-validate dev: true - /@graphql-tools/relay-operation-optimizer@6.5.18(graphql@15.8.0): + /@graphql-tools/relay-operation-optimizer@6.5.18(graphql@15.9.0): resolution: {integrity: sha512-mc5VPyTeV+LwiM+DNvoDQfPqwQYhPV/cl5jOBjTgSniyaq8/86aODfMkrE2OduhQ5E00hqrkuL2Fdrgk0w1QJg==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@ardatan/relay-compiler': 12.0.0(graphql@15.8.0) - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) - graphql: 15.8.0 + '@ardatan/relay-compiler': 12.0.0(graphql@15.9.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) + graphql: 15.9.0 tslib: 2.8.1 transitivePeerDependencies: - encoding - supports-color dev: true - /@graphql-tools/schema@8.5.1(graphql@15.8.0): + /@graphql-tools/schema@8.5.1(graphql@15.9.0): resolution: {integrity: sha512-0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/merge': 8.3.1(graphql@15.8.0) - '@graphql-tools/utils': 8.9.0(graphql@15.8.0) - graphql: 15.8.0 + '@graphql-tools/merge': 8.3.1(graphql@15.9.0) + '@graphql-tools/utils': 8.9.0(graphql@15.9.0) + graphql: 15.9.0 tslib: 2.8.1 value-or-promise: 1.0.11 dev: false - /@graphql-tools/schema@9.0.16(graphql@15.8.0): + /@graphql-tools/schema@9.0.16(graphql@15.9.0): resolution: {integrity: sha512-kF+tbYPPf/6K2aHG3e1SWIbapDLQaqnIHVRG6ow3onkFoowwtKszvUyOASL6Krcv2x9bIMvd1UkvRf9OaoROQQ==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/merge': 8.3.18(graphql@15.8.0) - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) - graphql: 15.8.0 + '@graphql-tools/merge': 8.3.18(graphql@15.9.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) + graphql: 15.9.0 tslib: 2.8.1 value-or-promise: 1.0.12 - /@graphql-tools/schema@9.0.19(graphql@15.8.0): + /@graphql-tools/schema@9.0.19(graphql@15.9.0): resolution: {integrity: sha512-oBRPoNBtCkk0zbUsyP4GaIzCt8C0aCI4ycIRUL67KK5pOHljKLBBtGT+Jr6hkzA74C8Gco8bpZPe7aWFjiaK2w==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/merge': 8.4.2(graphql@15.8.0) - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) - graphql: 15.8.0 + '@graphql-tools/merge': 8.4.2(graphql@15.9.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) + graphql: 15.9.0 tslib: 2.8.1 value-or-promise: 1.0.12 - /@graphql-tools/url-loader@7.17.18(@types/node@18.19.8)(graphql@15.8.0): + /@graphql-tools/url-loader@7.17.18(@types/node@18.19.8)(graphql@15.9.0): resolution: {integrity: sha512-ear0CiyTj04jCVAxi7TvgbnGDIN2HgqzXzwsfcqiVg9cvjT40NcMlZ2P1lZDgqMkZ9oyLTV8Bw6j+SyG6A+xPw==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: '@ardatan/sync-fetch': 0.0.1 - '@graphql-tools/delegate': 9.0.35(graphql@15.8.0) - '@graphql-tools/executor-graphql-ws': 0.0.14(graphql@15.8.0) - '@graphql-tools/executor-http': 0.1.10(@types/node@18.19.8)(graphql@15.8.0) - '@graphql-tools/executor-legacy-ws': 0.0.11(graphql@15.8.0) - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) - '@graphql-tools/wrap': 9.4.2(graphql@15.8.0) + '@graphql-tools/delegate': 9.0.35(graphql@15.9.0) + '@graphql-tools/executor-graphql-ws': 0.0.14(graphql@15.9.0) + '@graphql-tools/executor-http': 0.1.10(@types/node@18.19.8)(graphql@15.9.0) + '@graphql-tools/executor-legacy-ws': 0.0.11(graphql@15.9.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) + '@graphql-tools/wrap': 9.4.2(graphql@15.9.0) '@types/ws': 8.5.10 '@whatwg-node/fetch': 0.8.8 - graphql: 15.8.0 + graphql: 15.9.0 isomorphic-ws: 5.0.0(ws@8.16.0) tslib: 2.8.1 value-or-promise: 1.0.12 @@ -5528,63 +5528,63 @@ packages: - utf-8-validate dev: true - /@graphql-tools/utils@7.10.0(graphql@15.8.0): + /@graphql-tools/utils@7.10.0(graphql@15.9.0): resolution: {integrity: sha512-d334r6bo9mxdSqZW6zWboEnnOOFRrAPVQJ7LkU8/6grglrbcu6WhwCLzHb90E94JI3TD3ricC3YGbUqIi9Xg0w==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 dependencies: '@ardatan/aggregate-error': 0.0.6 camel-case: 4.1.2 - graphql: 15.8.0 + graphql: 15.9.0 tslib: 2.2.0 dev: true - /@graphql-tools/utils@8.13.1(graphql@15.8.0): + /@graphql-tools/utils@8.13.1(graphql@15.9.0): resolution: {integrity: sha512-qIh9yYpdUFmctVqovwMdheVNJqFh+DQNWIhX87FJStfXYnmweBUDATok9fWPleKeFwxnW8IapKmY8m8toJEkAw==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - graphql: 15.8.0 + graphql: 15.9.0 tslib: 2.8.1 dev: true - /@graphql-tools/utils@8.9.0(graphql@15.8.0): + /@graphql-tools/utils@8.9.0(graphql@15.9.0): resolution: {integrity: sha512-pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - graphql: 15.8.0 + graphql: 15.9.0 tslib: 2.8.1 dev: false - /@graphql-tools/utils@9.2.1(graphql@15.8.0): + /@graphql-tools/utils@9.2.1(graphql@15.9.0): resolution: {integrity: sha512-WUw506Ql6xzmOORlriNrD6Ugx+HjVgYxt9KCXD9mHAak+eaXSwuGGPyE60hy9xaDEoXKBsG7SkG69ybitaVl6A==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-typed-document-node/core': 3.2.0(graphql@15.8.0) - graphql: 15.8.0 + '@graphql-typed-document-node/core': 3.2.0(graphql@15.9.0) + graphql: 15.9.0 tslib: 2.8.1 - /@graphql-tools/wrap@9.4.2(graphql@15.8.0): + /@graphql-tools/wrap@9.4.2(graphql@15.9.0): resolution: {integrity: sha512-DFcd9r51lmcEKn0JW43CWkkI2D6T9XI1juW/Yo86i04v43O9w2/k4/nx2XTJv4Yv+iXwUw7Ok81PGltwGJSDSA==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 dependencies: - '@graphql-tools/delegate': 9.0.35(graphql@15.8.0) - '@graphql-tools/schema': 9.0.19(graphql@15.8.0) - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) - graphql: 15.8.0 + '@graphql-tools/delegate': 9.0.35(graphql@15.9.0) + '@graphql-tools/schema': 9.0.19(graphql@15.9.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) + graphql: 15.9.0 tslib: 2.8.1 value-or-promise: 1.0.12 dev: true - /@graphql-typed-document-node/core@3.2.0(graphql@15.8.0): + /@graphql-typed-document-node/core@3.2.0(graphql@15.9.0): resolution: {integrity: sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==} peerDependencies: 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 || ^17.0.0 dependencies: - graphql: 15.8.0 + graphql: 15.9.0 /@grpc/grpc-js@1.9.14: resolution: {integrity: sha512-nOpuzZ2G3IuMFN+UPPpKrC6NsLmWsTqSsm66IRfnBt1D4pwTqE27lmbpcPM+l2Ua4gE7PfjRHI6uedAy7hoXUw==} @@ -6703,7 +6703,7 @@ packages: transitivePeerDependencies: - '@types/react' - /@nestjs/apollo@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): + /@nestjs/apollo@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.9.0): resolution: {integrity: sha512-xAui+/ZQ5THeO09YgAyP+AZyPvJplH8F3azwV8sMJjbbEaQev6gyzbZsCCbcVcCiHIL0t20JmNPmLIY9BIdRrg==} peerDependencies: '@apollo/gateway': ^0.44.1 || ^0.46.0 || ^0.48.0 || ^0.49.0 || ^0.50.0 || ^2.0.0 @@ -6729,10 +6729,10 @@ packages: dependencies: '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(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.14.1)(graphql@15.8.0)(reflect-metadata@0.1.14) - apollo-server-core: 3.13.0(graphql@15.8.0) - apollo-server-express: 3.13.0(express@4.21.1)(graphql@15.8.0) - graphql: 15.8.0 + '@nestjs/graphql': 10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(graphql@15.9.0)(reflect-metadata@0.1.14) + apollo-server-core: 3.13.0(graphql@15.9.0) + apollo-server-express: 3.13.0(express@4.21.1)(graphql@15.9.0) + graphql: 15.9.0 iterall: 1.3.0 lodash.omit: 4.5.0 tslib: 2.5.0 @@ -6873,7 +6873,7 @@ packages: transitivePeerDependencies: - encoding - /@nestjs/graphql@10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(graphql@15.8.0)(reflect-metadata@0.1.14): + /@nestjs/graphql@10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(graphql@15.9.0)(reflect-metadata@0.1.14): resolution: {integrity: sha512-FBzYTymT4oopiGMpej7GTRyhz1BgJxLlXZPUueamC5J9u1WxCwJyETkzBI/zeUkUydlklF/xd5zDd/Md6//hEw==} peerDependencies: '@apollo/subgraph': ^0.1.5 || ^0.3.0 || ^0.4.0 || ^2.0.0 @@ -6894,9 +6894,9 @@ packages: ts-morph: optional: true dependencies: - '@graphql-tools/merge': 8.3.18(graphql@15.8.0) - '@graphql-tools/schema': 9.0.16(graphql@15.8.0) - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) + '@graphql-tools/merge': 8.3.18(graphql@15.9.0) + '@graphql-tools/schema': 9.0.16(graphql@15.9.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(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/mapped-types': 1.2.2(@nestjs/common@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14) @@ -6904,13 +6904,13 @@ packages: class-transformer: 0.5.1 class-validator: 0.14.1 fast-glob: 3.2.12 - graphql: 15.8.0 - graphql-tag: 2.12.6(graphql@15.8.0) - graphql-ws: 5.11.3(graphql@15.8.0) + graphql: 15.9.0 + graphql-tag: 2.12.6(graphql@15.9.0) + graphql-ws: 5.11.3(graphql@15.9.0) lodash: 4.17.21 normalize-path: 3.0.0 reflect-metadata: 0.1.14 - subscriptions-transport-ws: 0.11.0(graphql@15.8.0) + subscriptions-transport-ws: 0.11.0(graphql@15.9.0) tslib: 2.5.0 uuid: 9.0.0 ws: 8.12.0 @@ -10129,7 +10129,7 @@ packages: '@apollo/protobufjs': 1.2.6 dev: false - /apollo-server-core@3.13.0(graphql@15.8.0): + /apollo-server-core@3.13.0(graphql@15.9.0): resolution: {integrity: sha512-v/g6DR6KuHn9DYSdtQijz8dLOkP78I5JSVJzPkARhDbhpH74QNwrQ2PP2URAPPEDJ2EeZNQDX8PvbYkAKqg+kg==} engines: {node: '>=12.0'} deprecated: The `apollo-server-core` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. @@ -10138,22 +10138,22 @@ packages: dependencies: '@apollo/utils.keyvaluecache': 1.0.2 '@apollo/utils.logger': 1.0.1 - '@apollo/utils.usagereporting': 1.0.1(graphql@15.8.0) - '@apollographql/apollo-tools': 0.5.4(graphql@15.8.0) + '@apollo/utils.usagereporting': 1.0.1(graphql@15.9.0) + '@apollographql/apollo-tools': 0.5.4(graphql@15.9.0) '@apollographql/graphql-playground-html': 1.6.29 - '@graphql-tools/mock': 8.7.20(graphql@15.8.0) - '@graphql-tools/schema': 8.5.1(graphql@15.8.0) + '@graphql-tools/mock': 8.7.20(graphql@15.9.0) + '@graphql-tools/schema': 8.5.1(graphql@15.9.0) '@josephg/resolvable': 1.0.1 apollo-datasource: 3.3.2 apollo-reporting-protobuf: 3.4.0 apollo-server-env: 4.2.1 - apollo-server-errors: 3.3.1(graphql@15.8.0) - apollo-server-plugin-base: 3.7.2(graphql@15.8.0) - apollo-server-types: 3.8.0(graphql@15.8.0) + apollo-server-errors: 3.3.1(graphql@15.9.0) + apollo-server-plugin-base: 3.7.2(graphql@15.9.0) + apollo-server-types: 3.8.0(graphql@15.9.0) async-retry: 1.3.3 fast-json-stable-stringify: 2.1.0 - graphql: 15.8.0 - graphql-tag: 2.12.6(graphql@15.8.0) + graphql: 15.9.0 + graphql-tag: 2.12.6(graphql@15.9.0) loglevel: 1.8.1 lru-cache: 6.0.0 node-abort-controller: 3.1.1 @@ -10174,17 +10174,17 @@ packages: - encoding dev: false - /apollo-server-errors@3.3.1(graphql@15.8.0): + /apollo-server-errors@3.3.1(graphql@15.9.0): resolution: {integrity: sha512-xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA==} engines: {node: '>=12.0'} deprecated: The `apollo-server-errors` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. peerDependencies: graphql: ^15.3.0 || ^16.0.0 dependencies: - graphql: 15.8.0 + graphql: 15.9.0 dev: false - /apollo-server-express@3.13.0(express@4.21.1)(graphql@15.8.0): + /apollo-server-express@3.13.0(express@4.21.1)(graphql@15.9.0): resolution: {integrity: sha512-iSxICNbDUyebOuM8EKb3xOrpIwOQgKxGbR2diSr4HP3IW8T3njKFOoMce50vr+moOCe1ev8BnLcw9SNbuUtf7g==} engines: {node: '>=12.0'} deprecated: The `apollo-server-express` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. @@ -10198,32 +10198,32 @@ packages: '@types/express': 4.17.14 '@types/express-serve-static-core': 4.17.31 accepts: 1.3.8 - apollo-server-core: 3.13.0(graphql@15.8.0) - apollo-server-types: 3.8.0(graphql@15.8.0) + apollo-server-core: 3.13.0(graphql@15.9.0) + apollo-server-types: 3.8.0(graphql@15.9.0) body-parser: 1.20.3 cors: 2.8.5 express: 4.21.1 - graphql: 15.8.0 + graphql: 15.9.0 parseurl: 1.3.3 transitivePeerDependencies: - encoding - supports-color dev: false - /apollo-server-plugin-base@3.7.2(graphql@15.8.0): + /apollo-server-plugin-base@3.7.2(graphql@15.9.0): resolution: {integrity: sha512-wE8dwGDvBOGehSsPTRZ8P/33Jan6/PmL0y0aN/1Z5a5GcbFhDaaJCjK5cav6npbbGL2DPKK0r6MPXi3k3N45aw==} engines: {node: '>=12.0'} deprecated: The `apollo-server-plugin-base` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. peerDependencies: graphql: ^15.3.0 || ^16.0.0 dependencies: - apollo-server-types: 3.8.0(graphql@15.8.0) - graphql: 15.8.0 + apollo-server-types: 3.8.0(graphql@15.9.0) + graphql: 15.9.0 transitivePeerDependencies: - encoding dev: false - /apollo-server-types@3.8.0(graphql@15.8.0): + /apollo-server-types@3.8.0(graphql@15.9.0): resolution: {integrity: sha512-ZI/8rTE4ww8BHktsVpb91Sdq7Cb71rdSkXELSwdSR0eXu600/sY+1UXhTWdiJvk+Eq5ljqoHLwLbY2+Clq2b9A==} engines: {node: '>=12.0'} deprecated: The `apollo-server-types` package is part of Apollo Server v2 and v3, which are now end-of-life (as of October 22nd 2023 and October 22nd 2024, respectively). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. @@ -10234,7 +10234,7 @@ packages: '@apollo/utils.logger': 1.0.1 apollo-reporting-protobuf: 3.4.0 apollo-server-env: 4.2.1 - graphql: 15.8.0 + graphql: 15.9.0 transitivePeerDependencies: - encoding dev: false @@ -14045,7 +14045,7 @@ packages: /graphemer@1.4.0: resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} - /graphql-config@4.5.0(@types/node@18.19.8)(graphql@15.8.0): + /graphql-config@4.5.0(@types/node@18.19.8)(graphql@15.9.0): resolution: {integrity: sha512-x6D0/cftpLUJ0Ch1e5sj1TZn6Wcxx4oMfmhaG9shM0DKajA9iR+j1z86GSTQ19fShbGvrSSvbIQsHku6aQ6BBw==} engines: {node: '>= 10.0.0'} peerDependencies: @@ -14055,14 +14055,14 @@ packages: cosmiconfig-toml-loader: optional: true dependencies: - '@graphql-tools/graphql-file-loader': 7.5.17(graphql@15.8.0) - '@graphql-tools/json-file-loader': 7.4.18(graphql@15.8.0) - '@graphql-tools/load': 7.8.14(graphql@15.8.0) - '@graphql-tools/merge': 8.4.2(graphql@15.8.0) - '@graphql-tools/url-loader': 7.17.18(@types/node@18.19.8)(graphql@15.8.0) - '@graphql-tools/utils': 9.2.1(graphql@15.8.0) + '@graphql-tools/graphql-file-loader': 7.5.17(graphql@15.9.0) + '@graphql-tools/json-file-loader': 7.4.18(graphql@15.9.0) + '@graphql-tools/load': 7.8.14(graphql@15.9.0) + '@graphql-tools/merge': 8.4.2(graphql@15.9.0) + '@graphql-tools/url-loader': 7.17.18(@types/node@18.19.8)(graphql@15.9.0) + '@graphql-tools/utils': 9.2.1(graphql@15.9.0) cosmiconfig: 8.0.0 - graphql: 15.8.0 + graphql: 15.9.0 jiti: 1.17.1 minimatch: 4.2.3 string-env-interpolation: 1.0.1 @@ -14074,19 +14074,19 @@ packages: - utf-8-validate dev: true - /graphql-parse-resolve-info@4.13.0(graphql@15.8.0): + /graphql-parse-resolve-info@4.13.0(graphql@15.9.0): resolution: {integrity: sha512-VVJ1DdHYcR7hwOGQKNH+QTzuNgsLA8l/y436HtP9YHoX6nmwXRWq3xWthU3autMysXdm0fQUbhTZCx0W9ICozw==} engines: {node: '>=8.6'} peerDependencies: graphql: '>=0.9 <0.14 || ^14.0.2 || ^15.4.0 || ^16.3.0' dependencies: debug: 4.3.7(supports-color@9.4.0) - graphql: 15.8.0 + graphql: 15.9.0 tslib: 2.8.1 transitivePeerDependencies: - supports-color - /graphql-request@3.7.0(graphql@15.8.0): + /graphql-request@3.7.0(graphql@15.9.0): resolution: {integrity: sha512-dw5PxHCgBneN2DDNqpWu8QkbbJ07oOziy8z+bK/TAXufsOLaETuVO4GkXrbs0WjhdKhBMN3BkpN/RIvUHkmNUQ==} peerDependencies: graphql: 14 - 16 @@ -14094,60 +14094,60 @@ packages: cross-fetch: 3.1.8 extract-files: 9.0.0 form-data: 3.0.1 - graphql: 15.8.0 + graphql: 15.9.0 transitivePeerDependencies: - encoding dev: false - /graphql-request@6.1.0(graphql@15.8.0): + /graphql-request@6.1.0(graphql@15.9.0): resolution: {integrity: sha512-p+XPfS4q7aIpKVcgmnZKhMNqhltk20hfXtkaIkTfjjmiKMJ5xrt5c743cL03y/K7y1rg3WrIC49xGiEQ4mxdNw==} peerDependencies: graphql: 14 - 16 dependencies: - '@graphql-typed-document-node/core': 3.2.0(graphql@15.8.0) + '@graphql-typed-document-node/core': 3.2.0(graphql@15.9.0) cross-fetch: 3.1.8 - graphql: 15.8.0 + graphql: 15.9.0 transitivePeerDependencies: - encoding dev: true - /graphql-scalars@1.23.0(graphql@15.8.0): + /graphql-scalars@1.23.0(graphql@15.9.0): resolution: {integrity: sha512-YTRNcwitkn8CqYcleKOx9IvedA8JIERn8BRq21nlKgOr4NEcTaWEG0sT+H92eF3ALTFbPgsqfft4cw+MGgv0Gg==} engines: {node: '>=10'} peerDependencies: 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 + graphql: 15.9.0 tslib: 2.8.1 - /graphql-tag@2.12.6(graphql@15.8.0): + /graphql-tag@2.12.6(graphql@15.9.0): resolution: {integrity: sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==} 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 dependencies: - graphql: 15.8.0 + graphql: 15.9.0 tslib: 2.8.1 - /graphql-ws@5.11.3(graphql@15.8.0): + /graphql-ws@5.11.3(graphql@15.9.0): resolution: {integrity: sha512-fU8zwSgAX2noXAsuFiCZ8BtXeXZOzXyK5u1LloCdacsVth4skdBMPO74EG51lBoWSIZ8beUocdpV8+cQHBODnQ==} engines: {node: '>=10'} peerDependencies: graphql: '>=0.11 <=16' dependencies: - graphql: 15.8.0 + graphql: 15.9.0 - /graphql-ws@5.12.1(graphql@15.8.0): + /graphql-ws@5.12.1(graphql@15.9.0): resolution: {integrity: sha512-umt4f5NnMK46ChM2coO36PTFhHouBrK9stWWBczERguwYrGnPNxJ9dimU6IyOBfOkC6Izhkg4H8+F51W/8CYDg==} engines: {node: '>=10'} peerDependencies: graphql: '>=0.11 <=16' dependencies: - graphql: 15.8.0 + graphql: 15.9.0 dev: true - /graphql@15.8.0: - resolution: {integrity: sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw==} + /graphql@15.9.0: + resolution: {integrity: sha512-GCOQdvm7XxV1S4U4CGrsdlEN37245eC8P9zaYCMr6K1BG0IPGy5lUwmJsEOGyl1GD6HXjOtl2keCP9asRBwNvA==} engines: {node: '>= 10.x'} /gzip-size@6.0.0: @@ -20343,7 +20343,7 @@ packages: resolution: {integrity: sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg==} dev: false - /subscriptions-transport-ws@0.11.0(graphql@15.8.0): + /subscriptions-transport-ws@0.11.0(graphql@15.9.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 peerDependencies: @@ -20351,7 +20351,7 @@ packages: dependencies: backo2: 1.0.2 eventemitter3: 3.1.2 - graphql: 15.8.0 + graphql: 15.9.0 iterall: 1.3.0 symbol-observable: 1.2.0 ws: 7.5.9 @@ -20605,6 +20605,7 @@ packages: /to-regex-range@5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} + requiresBuild: true dependencies: is-number: 7.0.0 From 2400a6d5f44c36e25752260b079a4d3eb3bafd0c Mon Sep 17 00:00:00 2001 From: Thomas Dax Date: Fri, 13 Dec 2024 13:44:26 +0100 Subject: [PATCH 107/121] Fix conflicts --- demo/admin/src/Routes.tsx | 125 ------------------ demo/admin/src/common/MasterMenu.tsx | 91 ++++--------- demo/campaign/src/documents/pages/Page.tsx | 43 ------ .../src/documents/pages/blocks/SeoBlock.tsx | 37 ------ .../BrevoTestContactsGrid.tsx | 45 +++---- .../BrevoTestContactsPage.tsx | 8 +- .../form/BrevoTestContactForm.tsx | 94 +++++++------ .../src/mikro-orm/migrations/migrations.ts | 10 +- .../target-group/dto/target-group.filter.ts | 6 +- 9 files changed, 97 insertions(+), 362 deletions(-) delete mode 100644 demo/admin/src/Routes.tsx delete mode 100644 demo/campaign/src/documents/pages/Page.tsx delete mode 100644 demo/campaign/src/documents/pages/blocks/SeoBlock.tsx diff --git a/demo/admin/src/Routes.tsx b/demo/admin/src/Routes.tsx deleted file mode 100644 index 60c21c1d..00000000 --- a/demo/admin/src/Routes.tsx +++ /dev/null @@ -1,125 +0,0 @@ -import { MasterLayout, RouteWithErrorBoundary } from "@comet/admin"; -import { Domain } from "@comet/admin-icons"; -import { createBrevoContactsPage, createBrevoTestContactsPage, createEmailCampaignsPage, createTargetGroupsPage } from "@comet/brevo-admin"; -import { ContentScopeIndicator, createRedirectsPage, DamPage, PagesPage, PublisherPage, SitePreview } from "@comet/cms-admin"; -import { getBrevoContactConfig } from "@src/common/brevoModuleConfig/brevoContactsPageAttributesConfig"; -import { pageTreeCategories, urlParamToCategory } from "@src/pageTree/pageTreeCategories"; -import * as React from "react"; -import { useIntl } from "react-intl"; -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 { MasterHeader } from "./common/MasterHeader"; -import { MasterMenu } from "./common/MasterMenu"; -import { DashboardPage } from "./dashboard/DashboardPage"; -import { Link } from "./documents/links/Link"; -import { Page } from "./documents/pages/Page"; -import { EmailCampaignContentBlock } from "./emailCampaigns/blocks/EmailCampaignContentBlock"; - -const RedirectsPage = createRedirectsPage(); - -export const Routes: React.FC = () => { - const intl = useIntl(); - const brevoContactConfig = getBrevoContactConfig(intl); - - const BrevoContactsPage = createBrevoContactsPage({ - scopeParts: ["domain", "language"], - additionalAttributesFragment: brevoContactConfig.additionalAttributesFragment, - additionalGridFields: brevoContactConfig.additionalGridFields, - additionalFormFields: brevoContactConfig.additionalFormFields, - input2State: brevoContactConfig.input2State, - }); - - const BrevoTestContactsPage = createBrevoTestContactsPage({ - scopeParts: ["domain", "language"], - additionalAttributesFragment: brevoContactConfig.additionalAttributesFragment, - additionalGridFields: brevoContactConfig.additionalGridFields, - additionalFormFields: brevoContactConfig.additionalFormFields, - input2State: brevoContactConfig.input2State, - }); - - const TargetGroupsPage = createTargetGroupsPage({ - scopeParts: ["domain", "language"], - additionalFormFields: additionalFormConfig.additionalFormFields, - exportTargetGroupOptions: { - additionalAttributesFragment: brevoContactConfig.additionalAttributesFragment, - exportFields: brevoContactConfig.exportFields, - }, - nodeFragment: additionalFormConfig.nodeFragment, - input2State: additionalFormConfig.input2State, - }); - - const EmailCampaignsPage = createEmailCampaignsPage({ - scopeParts: ["domain", "language"], - EmailCampaignContentBlock: EmailCampaignContentBlock, - }); - - return ( - - {({ match }) => ( - - } /> - ( - - - - ) => { - const category = urlParamToCategory(params.category); - - if (category === undefined) { - return ; - } - - return ( - ( - - - - - {scope.domain} - - {" | "} - - {scope.language} - - - - )} - /> - ); - }} - /> - - - - - - - - - - } - /> - - - - )} - /> - - )} - - ); -}; diff --git a/demo/admin/src/common/MasterMenu.tsx b/demo/admin/src/common/MasterMenu.tsx index 2e031a1c..2b7b0e47 100644 --- a/demo/admin/src/common/MasterMenu.tsx +++ b/demo/admin/src/common/MasterMenu.tsx @@ -1,5 +1,11 @@ import { Assets, Dashboard, Mail, PageTree, Wrench } from "@comet/admin-icons"; -import { BrevoConfigPage, createBrevoContactsPage, createEmailCampaignsPage, createTargetGroupsPage } from "@comet/brevo-admin"; +import { + BrevoConfigPage, + createBrevoContactsPage, + createBrevoTestContactsPage, + createEmailCampaignsPage, + createTargetGroupsPage, +} from "@comet/brevo-admin"; import { AllCategories, ContentScopeIndicator, @@ -28,7 +34,6 @@ export const pageTreeCategories: AllCategories = [ }, ]; -<<<<<<< HEAD // eslint-disable-next-line @typescript-eslint/no-explicit-any export const pageTreeDocumentTypes: Record> = { Page, @@ -58,6 +63,14 @@ const getMasterMenuData = ({ brevoContactConfig }: { brevoContactConfig: BrevoCo EmailCampaignContentBlock, }); + const BrevoTestContactsPage = createBrevoTestContactsPage({ + scopeParts: ["domain", "language"], + additionalAttributesFragment: brevoContactConfig.additionalAttributesFragment, + additionalGridFields: brevoContactConfig.additionalGridFields, + additionalFormFields: brevoContactConfig.additionalFormFields, + input2State: brevoContactConfig.input2State, + }); + return [ { type: "route", @@ -107,6 +120,14 @@ const getMasterMenuData = ({ brevoContactConfig }: { brevoContactConfig: BrevoCo render: () => , }, }, + { + type: "route", + primary: , + route: { + path: "/newsletter/test-contacts", + render: () => , + }, + }, { type: "route", primary: , @@ -179,70 +200,4 @@ export const MasterRoutes = () => { const masterMenuDataForScope = React.useMemo(() => getMasterMenuData({ brevoContactConfig: getBrevoContactConfig(intl) }), [intl]); return ; -======= -export const MasterMenu: React.FC = () => { - const { open, toggleOpen } = React.useContext(MenuContext); - const windowSize = useWindowSize(); - const intl = useIntl(); - const match = useRouteMatch(); - - const useTemporaryMenu: boolean = windowSize.width < permanentMenuMinWidth; - - // Open menu when changing to permanent variant and close when changing to temporary variant. - React.useEffect(() => { - if ((useTemporaryMenu && open) || (!useTemporaryMenu && !open)) { - toggleOpen(); - } - // useEffect dependencies must only include `location`, because the function should only be called once after changing the location. - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [location]); - - return ( - - } - to={`${match.url}/dashboard`} - /> - } - to={`${match.url}/pages/pagetree/main-navigation`} - /> - }> - - - - - - } - to={`${match.url}/assets`} - /> - }> - - - - - ); ->>>>>>> main }; diff --git a/demo/campaign/src/documents/pages/Page.tsx b/demo/campaign/src/documents/pages/Page.tsx deleted file mode 100644 index 49890fa3..00000000 --- a/demo/campaign/src/documents/pages/Page.tsx +++ /dev/null @@ -1,43 +0,0 @@ -import { SeoBlock } from "@src/documents/pages/blocks/SeoBlock"; -import { Layout, PropsWithLayout } from "@src/layout/Layout"; -import { gql } from "graphql-request"; -import Head from "next/head"; -import * as React from "react"; - -import { PageContentBlock } from "./blocks/PageContentBlock"; -import { GQLPageQuery } from "./Page.generated"; - -export const pageQuery = gql` - query Page($pageId: ID!) { - pageContent: pageTreeNode(id: $pageId) { - name - path - document { - __typename - ... on Page { - content - seo - } - } - } - } -`; - -export function Page(props: PropsWithLayout): JSX.Element { - const document = props.pageContent?.document; - return ( - - - - - {document?.__typename === "Page" && ( - - )} - {document && document.__typename === "Page" ?
{document.content && }
: null} - - ); -} diff --git a/demo/campaign/src/documents/pages/blocks/SeoBlock.tsx b/demo/campaign/src/documents/pages/blocks/SeoBlock.tsx deleted file mode 100644 index 0b395246..00000000 --- a/demo/campaign/src/documents/pages/blocks/SeoBlock.tsx +++ /dev/null @@ -1,37 +0,0 @@ -import { generateImageUrl, PropsWithData } from "@comet/cms-site"; -import { SeoBlockData } from "@src/blocks.generated"; -import Head from "next/head"; -import * as React from "react"; - -interface SeoBlockProps extends PropsWithData { - title: string; - canonicalUrl: string; -} -export const SeoBlock: React.FunctionComponent = ({ - data: { htmlTitle, metaDescription, openGraphTitle, openGraphDescription, openGraphImage, noIndex }, - title, - canonicalUrl, -}) => { - const usedHtmlTitle = htmlTitle && htmlTitle != "" ? htmlTitle : title; - return ( - - {usedHtmlTitle} - - {/* Meta*/} - {metaDescription && } - - - {/* Open Graph */} - {openGraphTitle && } - {openGraphDescription && } - - - {openGraphImage.block?.urlTemplate && ( - - )} - - {/* No Index */} - {noIndex && } - - ); -}; diff --git a/packages/admin/src/brevoTestContacts/BrevoTestContactsGrid.tsx b/packages/admin/src/brevoTestContacts/BrevoTestContactsGrid.tsx index aa3b12d5..84a82fee 100644 --- a/packages/admin/src/brevoTestContacts/BrevoTestContactsGrid.tsx +++ b/packages/admin/src/brevoTestContacts/BrevoTestContactsGrid.tsx @@ -1,12 +1,13 @@ import { DocumentNode, gql, useApolloClient, useQuery } from "@apollo/client"; import { Alert, + DataGridToolbar, + GridColDef, MainContent, messages, RowActionsItem, RowActionsMenu, StackLink, - Toolbar, ToolbarActions, ToolbarFillSpace, ToolbarItem, @@ -18,7 +19,7 @@ import { import { Add, Delete, Edit } from "@comet/admin-icons"; import { ContentScopeInterface } from "@comet/cms-admin"; import { Box, 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"; @@ -50,27 +51,25 @@ const deleteBrevoTestContactMutation = gql` function BrevoTestContactsGridToolbar({ intl, scope }: { intl: IntlShape; scope: GQLEmailCampaignContentScopeInput }) { return ( - <> - - - - - - - - - - - - - + + + + + + + + + + + + ); } diff --git a/packages/admin/src/brevoTestContacts/BrevoTestContactsPage.tsx b/packages/admin/src/brevoTestContacts/BrevoTestContactsPage.tsx index 88ea1634..f961de5a 100644 --- a/packages/admin/src/brevoTestContacts/BrevoTestContactsPage.tsx +++ b/packages/admin/src/brevoTestContacts/BrevoTestContactsPage.tsx @@ -1,6 +1,5 @@ -import { Stack, StackPage, StackSwitch } from "@comet/admin"; -import { useContentScope } from "@comet/cms-admin"; -import { GridColDef } from "@mui/x-data-grid"; +import { GridColDef, Stack, StackPage, StackSwitch, StackToolbar } from "@comet/admin"; +import { ContentScopeIndicator, useContentScope } from "@comet/cms-admin"; import { DocumentNode } from "graphql"; import * as React from "react"; import { useIntl } from "react-intl"; @@ -33,9 +32,10 @@ function createBrevoTestContactsPage({ }, {} as { [key: string]: unknown }); return ( - + + } /> apiRef={formApiRef} onSubmit={handleSubmit} mode={mode} initialValues={initialValues}> - {({ values }) => ( - - {saveConflict.dialogs} - - - - - - - - - - - - - - - - {mode === "edit" && ( - - - - - - )} - } - disabled={mode === "edit"} - /> - - {additionalFormFields && ( - - } - > - {additionalFormFields} - - - )} - - - )} + <> + {saveConflict.dialogs} + + + + + + + + + + + + + + + + {mode === "edit" && ( + + + + + + )} + } + disabled={mode === "edit"} + /> + + {additionalFormFields && ( + + }> + {additionalFormFields} + + + )} + + ); } diff --git a/packages/api/src/mikro-orm/migrations/migrations.ts b/packages/api/src/mikro-orm/migrations/migrations.ts index e5f530d9..48b2aab4 100644 --- a/packages/api/src/mikro-orm/migrations/migrations.ts +++ b/packages/api/src/mikro-orm/migrations/migrations.ts @@ -8,11 +8,8 @@ import { Migration20240619092554 } from "./Migration20240619092554"; import { Migration20240619145217 } from "./Migration20240619145217"; import { Migration20240621102349 } from "./Migration20240621102349"; import { Migration20240819214939 } from "./Migration20240819214939"; -<<<<<<< HEAD -import { Migration20241016123307 } from "./Migration20241016123307"; -======= import { Migration20240830112400 } from "./Migration20240830112400"; ->>>>>>> main +import { Migration20241016123307 } from "./Migration20241016123307"; export const migrationsList: MigrationObject[] = [ { name: "Migration20240115095733", class: Migration20240115095733 }, @@ -23,9 +20,6 @@ export const migrationsList: MigrationObject[] = [ { name: "Migration20240619145217", class: Migration20240619145217 }, { name: "Migration20240621102349", class: Migration20240621102349 }, { name: "Migration20240819214939", class: Migration20240819214939 }, -<<<<<<< HEAD - { name: "Migration20241016123307", class: Migration20241016123307 }, -======= { name: "Migration20240830112400", class: Migration20240830112400 }, ->>>>>>> main + { name: "Migration20241016123307", class: Migration20241016123307 }, ]; 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 4ff0d66c..ce2fad55 100644 --- a/packages/api/src/target-group/dto/target-group.filter.ts +++ b/packages/api/src/target-group/dto/target-group.filter.ts @@ -1,8 +1,4 @@ -<<<<<<< HEAD -import { DateTimeFilter, StringFilter } from "@comet/cms-api"; -======= -import { BooleanFilter, DateFilter, StringFilter } from "@comet/cms-api"; ->>>>>>> main +import { BooleanFilter, DateTimeFilter, StringFilter } from "@comet/cms-api"; import { Field, InputType } from "@nestjs/graphql"; import { Type } from "class-transformer"; import { IsOptional, ValidateNested } from "class-validator"; From 7215ec1013e08d28f1773f139b148c3e347692f0 Mon Sep 17 00:00:00 2001 From: juliawegmayr <109900447+juliawegmayr@users.noreply.github.com> Date: Wed, 18 Dec 2024 14:13:33 +0100 Subject: [PATCH 108/121] Add folder id to config (#159) Co-authored-by: Julia Wegmayr --- .changeset/new-cobras-thank.md | 6 ++++ demo/api/schema.gql | 3 ++ .../brevoConfiguration/BrevoConfigForm.gql.ts | 1 + .../brevoConfiguration/BrevoConfigForm.tsx | 30 ++++++++++++++++++- packages/api/schema.gql | 3 ++ .../brevo-api/brevo-api-contact.service.ts | 12 ++++++-- .../brevo-config/dto/brevo-config.input.ts | 8 +++-- .../entities/brevo-config-entity.factory.ts | 7 ++++- .../migrations/Migration20241119101706.ts | 8 +++++ .../src/mikro-orm/migrations/migrations.ts | 2 ++ 10 files changed, 74 insertions(+), 6 deletions(-) create mode 100644 .changeset/new-cobras-thank.md create mode 100644 packages/api/src/mikro-orm/migrations/Migration20241119101706.ts diff --git a/.changeset/new-cobras-thank.md b/.changeset/new-cobras-thank.md new file mode 100644 index 00000000..b6234e00 --- /dev/null +++ b/.changeset/new-cobras-thank.md @@ -0,0 +1,6 @@ +--- +"@comet/brevo-admin": minor +"@comet/brevo-api": minor +--- + +Add `folderId` to `BrevoConfig` to allow overwriting the default folderId `1` diff --git a/demo/api/schema.gql b/demo/api/schema.gql index 8a0ea14b..964791e7 100644 --- a/demo/api/schema.gql +++ b/demo/api/schema.gql @@ -461,6 +461,7 @@ type BrevoConfig implements DocumentInterface { updatedAt: DateTime! senderMail: String! senderName: String! + folderId: Int! createdAt: DateTime! scope: EmailCampaignContentScope! } @@ -1008,9 +1009,11 @@ input TargetGroupUpdateInput { input BrevoConfigInput { senderMail: String! senderName: String! + folderId: Int! } input BrevoConfigUpdateInput { senderMail: String senderName: String + folderId: Int } diff --git a/packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts b/packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts index a8358e6d..26384d01 100644 --- a/packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts +++ b/packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts @@ -4,6 +4,7 @@ export const brevoConfigFormFragment = gql` fragment BrevoConfigForm on BrevoConfig { senderMail senderName + folderId } `; diff --git a/packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx b/packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx index 9210b2b3..f946e052 100644 --- a/packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx +++ b/packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx @@ -7,13 +7,16 @@ import { FinalFormSubmitEvent, Loading, MainContent, + NumberField, Toolbar, ToolbarActions, ToolbarFillSpace, ToolbarTitleItem, + Tooltip, useFormApiRef, useStackSwitchApi, } from "@comet/admin"; +import { Info } from "@comet/admin-icons"; import { ContentScopeIndicator, ContentScopeInterface, resolveHasSaveConflict, useFormSaveConflict } from "@comet/cms-admin"; import { FormApi } from "final-form"; import React from "react"; @@ -37,6 +40,7 @@ interface Option { } type FormValues = { sender: Option; + folderId: number; }; interface FormProps { @@ -76,9 +80,10 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { value: sender.id, label: `${sender.name} (${sender.email})`, }, + folderId: data?.brevoConfig?.folderId ?? 1, } : {}; - }, [data?.brevoConfig?.senderMail, data?.brevoConfig?.senderName, sendersData?.senders]); + }, [data?.brevoConfig?.folderId, data?.brevoConfig?.senderMail, data?.brevoConfig?.senderName, sendersData?.senders]); const saveConflict = useFormSaveConflict({ checkConflict: async () => { @@ -117,6 +122,7 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { const output = { senderName: sender?.name, senderMail: sender?.email, + folderId: state.folderId ?? 1, }; if (mode === "edit") { @@ -174,6 +180,28 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { label={} fullWidth /> + + + + } + sx={{ marginLeft: "5px" }} + > + + + + } + fullWidth + required + /> ); diff --git a/packages/api/schema.gql b/packages/api/schema.gql index 0c8f7b55..be6375db 100644 --- a/packages/api/schema.gql +++ b/packages/api/schema.gql @@ -186,6 +186,7 @@ type BrevoConfig implements DocumentInterface { updatedAt: DateTime! senderMail: String! senderName: String! + folderId: Int! createdAt: DateTime! scope: EmailCampaignContentScope! } @@ -373,9 +374,11 @@ input SendTestEmailCampaignArgs { input BrevoConfigInput { senderMail: String! senderName: String! + folderId: Int! } input BrevoConfigUpdateInput { senderMail: String senderName: String + folderId: Int } diff --git a/packages/api/src/brevo-api/brevo-api-contact.service.ts b/packages/api/src/brevo-api/brevo-api-contact.service.ts index cbed193f..c83a0cff 100644 --- a/packages/api/src/brevo-api/brevo-api-contact.service.ts +++ b/packages/api/src/brevo-api/brevo-api-contact.service.ts @@ -1,5 +1,8 @@ import * as Brevo from "@getbrevo/brevo"; +import { EntityRepository } from "@mikro-orm/core"; +import { InjectRepository } from "@mikro-orm/nestjs"; import { Inject, Injectable } from "@nestjs/common"; +import { BrevoConfigInterface } from "src/brevo-config/entities/brevo-config-entity.factory"; import { BrevoContactAttributesInterface, EmailCampaignScopeInterface } from "src/types"; import { BrevoContactInterface } from "../brevo-contact/dto/brevo-contact.factory"; @@ -18,7 +21,10 @@ export interface CreateDoubleOptInContactData { export class BrevoApiContactsService { private readonly contactsApis = new Map(); - constructor(@Inject(BREVO_MODULE_CONFIG) private readonly config: BrevoModuleConfig) {} + constructor( + @Inject(BREVO_MODULE_CONFIG) private readonly config: BrevoModuleConfig, + @InjectRepository("BrevoConfig") private readonly brevoConfigRepository: EntityRepository, + ) {} private getContactsApi(scope: EmailCampaignScopeInterface): Brevo.ContactsApi { try { @@ -201,10 +207,12 @@ export class BrevoApiContactsService { } public async createBrevoContactList(title: string, scope: EmailCampaignScopeInterface): Promise { + const brevoConfig = await this.brevoConfigRepository.findOne({ scope }); + try { const contactList = { name: title, - folderId: 1, // folderId is required, folder #1 is created by default + folderId: brevoConfig?.folderId ?? 1, }; const data = await this.getContactsApi(scope).createList(contactList); diff --git a/packages/api/src/brevo-config/dto/brevo-config.input.ts b/packages/api/src/brevo-config/dto/brevo-config.input.ts index 1ceffdc5..746a1f45 100644 --- a/packages/api/src/brevo-config/dto/brevo-config.input.ts +++ b/packages/api/src/brevo-config/dto/brevo-config.input.ts @@ -1,6 +1,6 @@ import { PartialType } from "@comet/cms-api"; -import { Field, InputType } from "@nestjs/graphql"; -import { IsEmail, IsNotEmpty, IsString } from "class-validator"; +import { Field, InputType, Int } from "@nestjs/graphql"; +import { IsEmail, IsInt, IsNotEmpty, IsString } from "class-validator"; @InputType() export class BrevoConfigInput { @@ -14,6 +14,10 @@ export class BrevoConfigInput { @IsString() @Field() senderName: string; + + @Field(() => Int) + @IsInt() + folderId: number; } @InputType() diff --git a/packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts b/packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts index 57bd5fdd..c093a39d 100644 --- a/packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts +++ b/packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts @@ -1,7 +1,7 @@ import { DocumentInterface } from "@comet/cms-api"; import { Embedded, Entity, OptionalProps, PrimaryKey, Property } from "@mikro-orm/core"; import { Type } from "@nestjs/common"; -import { Field, ID, ObjectType } from "@nestjs/graphql"; +import { Field, ID, Int, ObjectType } from "@nestjs/graphql"; import { v4 } from "uuid"; import { EmailCampaignScopeInterface } from "../../types"; @@ -11,6 +11,7 @@ export interface BrevoConfigInterface { id: string; senderName: string; senderMail: string; + folderId: number; createdAt: Date; updatedAt: Date; scope: EmailCampaignScopeInterface; @@ -37,6 +38,10 @@ export class BrevoConfigEntityFactory { @Field() senderName: string; + @Property({ columnType: "int" }) + @Field(() => Int) + folderId: number; + @Property({ columnType: "timestamp with time zone", }) diff --git a/packages/api/src/mikro-orm/migrations/Migration20241119101706.ts b/packages/api/src/mikro-orm/migrations/Migration20241119101706.ts new file mode 100644 index 00000000..1e598c8b --- /dev/null +++ b/packages/api/src/mikro-orm/migrations/Migration20241119101706.ts @@ -0,0 +1,8 @@ +import { Migration } from "@mikro-orm/migrations"; + +export class Migration20241119101706 extends Migration { + async up(): Promise { + this.addSql('alter table "BrevoConfig" add column "folderId" int not null default 1;'); + this.addSql('alter table "BrevoConfig" alter column "folderId" drop default;'); + } +} diff --git a/packages/api/src/mikro-orm/migrations/migrations.ts b/packages/api/src/mikro-orm/migrations/migrations.ts index 48b2aab4..c6c16bdd 100644 --- a/packages/api/src/mikro-orm/migrations/migrations.ts +++ b/packages/api/src/mikro-orm/migrations/migrations.ts @@ -10,6 +10,7 @@ import { Migration20240621102349 } from "./Migration20240621102349"; import { Migration20240819214939 } from "./Migration20240819214939"; import { Migration20240830112400 } from "./Migration20240830112400"; import { Migration20241016123307 } from "./Migration20241016123307"; +import { Migration20241119101706 } from "./Migration20241119101706"; export const migrationsList: MigrationObject[] = [ { name: "Migration20240115095733", class: Migration20240115095733 }, @@ -22,4 +23,5 @@ export const migrationsList: MigrationObject[] = [ { name: "Migration20240819214939", class: Migration20240819214939 }, { name: "Migration20240830112400", class: Migration20240830112400 }, { name: "Migration20241016123307", class: Migration20241016123307 }, + { name: "Migration20241119101706", class: Migration20241119101706 }, ]; From 8ef6341274fd4e7b3ffed9d0aa1f2995ffbb3495 Mon Sep 17 00:00:00 2001 From: juliawegmayr <109900447+juliawegmayr@users.noreply.github.com> Date: Wed, 18 Dec 2024 14:41:20 +0100 Subject: [PATCH 109/121] Refactor EmailCampaignEntity and TargetGroupEntity (#244) Co-authored-by: Julia Wegmayr --- .changeset/happy-cups-design.md | 23 +++ demo/api/schema.gql | 74 ++++----- demo/api/src/app.module.ts | 4 + .../entities/email-campaign.entity.ts | 11 ++ .../entity/target-group.entity.ts | 5 + packages/api/generate-schema.ts | 8 +- packages/api/src/brevo-module.ts | 13 +- .../api/src/config/brevo-module.config.ts | 4 + .../email-campaign/email-campaign.module.ts | 10 +- .../entities/email-campaign-entity.factory.ts | 112 +++++++------- .../entity/target-group-entity.factory.ts | 144 +++++++++--------- 11 files changed, 221 insertions(+), 187 deletions(-) create mode 100644 .changeset/happy-cups-design.md create mode 100644 demo/api/src/email-campaign/entities/email-campaign.entity.ts create mode 100644 demo/api/src/target-group/entity/target-group.entity.ts diff --git a/.changeset/happy-cups-design.md b/.changeset/happy-cups-design.md new file mode 100644 index 00000000..f717c189 --- /dev/null +++ b/.changeset/happy-cups-design.md @@ -0,0 +1,23 @@ +--- +"@comet/brevo-api": major +--- + +Refactor `email-campaign` and `target-group` entity + +Use `createEmailCampaignEntity` for creating `email-campaign` entity. Pass `EmailCampaignContentBlock`, `Scope` and `TargetGroup`. + +Use `createTargetGroupEntity` for creating `target-group` entity. Pass `Scope` and optional `BrevoFilterAttributes` + +Pass both to the `AppModule`: + +````diff + BrevoModule.register({ + brevo: { + //... + + EmailCampaign + + TargetGroup + } + //... + }); + ``` +```` diff --git a/demo/api/schema.gql b/demo/api/schema.gql index 964791e7..40f47d66 100644 --- a/demo/api/schema.gql +++ b/demo/api/schema.gql @@ -378,6 +378,43 @@ type EmailCampaignContentScope { language: String! } +type TargetGroup implements DocumentInterface { + id: ID! + updatedAt: DateTime! + createdAt: DateTime! + title: String! + isMainList: Boolean! + isTestList: Boolean! + brevoId: Int! + totalSubscribers: Int! + scope: EmailCampaignContentScope! + assignedContactsTargetGroupBrevoId: Int + filters: BrevoContactFilterAttributes +} + +type EmailCampaign implements DocumentInterface { + id: ID! + updatedAt: DateTime! + createdAt: DateTime! + title: String! + subject: String! + brevoId: Int + scheduledAt: DateTime + targetGroups: [TargetGroup!]! + content: EmailCampaignContentBlockData! + scope: EmailCampaignContentScope! + sendingState: SendingState! +} + +"""EmailCampaignContent root block data""" +scalar EmailCampaignContentBlockData @specifiedBy(url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf") + +enum SendingState { + DRAFT + SENT + SCHEDULED +} + type PaginatedPageTreeNodes { nodes: [PageTreeNode!]! totalCount: Int! @@ -442,20 +479,6 @@ type PaginatedDamFolders { totalCount: Int! } -type TargetGroup implements DocumentInterface { - id: ID! - updatedAt: DateTime! - createdAt: DateTime! - title: String! - isMainList: Boolean! - isTestList: Boolean! - brevoId: Int! - totalSubscribers: Int! - scope: EmailCampaignContentScope! - assignedContactsTargetGroupBrevoId: Int - filters: BrevoContactFilterAttributes -} - type BrevoConfig implements DocumentInterface { id: ID! updatedAt: DateTime! @@ -483,29 +506,6 @@ type PaginatedBrevoContacts { totalCount: Int! } -type EmailCampaign implements DocumentInterface { - id: ID! - updatedAt: DateTime! - createdAt: DateTime! - title: String! - subject: String! - brevoId: Int - scheduledAt: DateTime - targetGroups: [TargetGroup!]! - content: EmailCampaignContentBlockData! - scope: EmailCampaignContentScope! - sendingState: SendingState! -} - -"""EmailCampaignContent root block data""" -scalar EmailCampaignContentBlockData @specifiedBy(url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf") - -enum SendingState { - DRAFT - SENT - SCHEDULED -} - type PaginatedEmailCampaigns { nodes: [EmailCampaign!]! totalCount: Int! diff --git a/demo/api/src/app.module.ts b/demo/api/src/app.module.ts index a5b466c0..afa605c9 100644 --- a/demo/api/src/app.module.ts +++ b/demo/api/src/app.module.ts @@ -39,8 +39,10 @@ import { DamFile } from "./dam/entities/dam-file.entity"; import { DamFolder } from "./dam/entities/dam-folder.entity"; import { EmailCampaignContentBlock } from "./email-campaign/blocks/email-campaign-content.block"; import { EmailCampaignContentScope } from "./email-campaign/email-campaign-content-scope"; +import { EmailCampaign } from "./email-campaign/entities/email-campaign.entity"; import { MenusModule } from "./menus/menus.module"; import { StatusModule } from "./status/status.module"; +import { TargetGroup } from "./target-group/entity/target-group.entity"; @Module({}) export class AppModule { @@ -161,6 +163,8 @@ export class AppModule { }, BrevoContactAttributes, BrevoContactFilterAttributes, + EmailCampaign, + TargetGroup, }, ecgRtrList: { apiKey: config.ecgRtrList.apiKey, diff --git a/demo/api/src/email-campaign/entities/email-campaign.entity.ts b/demo/api/src/email-campaign/entities/email-campaign.entity.ts new file mode 100644 index 00000000..e7365fdd --- /dev/null +++ b/demo/api/src/email-campaign/entities/email-campaign.entity.ts @@ -0,0 +1,11 @@ +import { createEmailCampaignEntity } from "@comet/brevo-api/lib/email-campaign/entities/email-campaign-entity.factory"; +import { TargetGroup } from "@src/target-group/entity/target-group.entity"; + +import { EmailCampaignContentBlock } from "../blocks/email-campaign-content.block"; +import { EmailCampaignContentScope } from "../email-campaign-content-scope"; + +export const EmailCampaign = createEmailCampaignEntity({ + EmailCampaignContentBlock: EmailCampaignContentBlock, + Scope: EmailCampaignContentScope, + TargetGroup: TargetGroup, +}); diff --git a/demo/api/src/target-group/entity/target-group.entity.ts b/demo/api/src/target-group/entity/target-group.entity.ts new file mode 100644 index 00000000..6d7cb482 --- /dev/null +++ b/demo/api/src/target-group/entity/target-group.entity.ts @@ -0,0 +1,5 @@ +import { createTargetGroupEntity } from "@comet/brevo-api/lib/target-group/entity/target-group-entity.factory"; +import { BrevoContactFilterAttributes } from "@src/brevo-contact/dto/brevo-contact-attributes"; +import { EmailCampaignContentScope } from "@src/email-campaign/email-campaign-content-scope"; + +export const TargetGroup = createTargetGroupEntity({ Scope: EmailCampaignContentScope, BrevoFilterAttributes: BrevoContactFilterAttributes }); diff --git a/packages/api/generate-schema.ts b/packages/api/generate-schema.ts index a005efd0..de6f75c2 100644 --- a/packages/api/generate-schema.ts +++ b/packages/api/generate-schema.ts @@ -16,9 +16,9 @@ import { BrevoTestContactInputFactory } from "./src/brevo-contact/dto/brevo-test import { SubscribeInputFactory } from "./src/brevo-contact/dto/subscribe-input.factory"; import { EmailCampaignInputFactory } from "./src/email-campaign/dto/email-campaign-input.factory"; import { createEmailCampaignsResolver } from "./src/email-campaign/email-campaign.resolver"; -import { EmailCampaignEntityFactory } from "./src/email-campaign/entities/email-campaign-entity.factory"; +import { createEmailCampaignEntity } from "./src/email-campaign/entities/email-campaign-entity.factory"; import { TargetGroupInputFactory } from "./src/target-group/dto/target-group-input.factory"; -import { TargetGroupEntityFactory } from "./src/target-group/entity/target-group-entity.factory"; +import { createTargetGroupEntity } from "./src/target-group/entity/target-group-entity.factory"; import { createTargetGroupsResolver } from "./src/target-group/target-group.resolver"; import { BrevoContactFilterAttributesInterface, EmailCampaignScopeInterface } from "./src/types"; @@ -82,11 +82,11 @@ async function generateSchema(): Promise { Scope: EmailCampaignScope, }); - const TargetGroup = TargetGroupEntityFactory.create({ Scope: EmailCampaignScope }); + const TargetGroup = createTargetGroupEntity({ Scope: EmailCampaignScope }); const [TargetGroupInput, TargetGroupUpdateInput] = TargetGroupInputFactory.create({ BrevoFilterAttributes: BrevoContactFilterAttributes }); const TargetGroupResolver = createTargetGroupsResolver({ TargetGroup, TargetGroupInput, TargetGroupUpdateInput, Scope: EmailCampaignScope }); - const EmailCampaign = EmailCampaignEntityFactory.create({ Scope: EmailCampaignScope, TargetGroup: TargetGroup, EmailCampaignContentBlock }); + const EmailCampaign = createEmailCampaignEntity({ Scope: EmailCampaignScope, TargetGroup: TargetGroup, EmailCampaignContentBlock }); const [EmailCampaignInput, EmailCampaignUpdateInput] = EmailCampaignInputFactory.create({ EmailCampaignContentBlock }); const EmailCampaignResolver = createEmailCampaignsResolver({ EmailCampaign, diff --git a/packages/api/src/brevo-module.ts b/packages/api/src/brevo-module.ts index 9a2dd7c6..d951b4b9 100644 --- a/packages/api/src/brevo-module.ts +++ b/packages/api/src/brevo-module.ts @@ -11,7 +11,6 @@ import { BrevoContactModule } from "./brevo-contact/brevo-contact.module"; import { BrevoModuleConfig } from "./config/brevo-module.config"; import { ConfigModule } from "./config/config.module"; import { EmailCampaignModule } from "./email-campaign/email-campaign.module"; -import { TargetGroupEntityFactory } from "./target-group/entity/target-group-entity.factory"; import { TargetGroupModule } from "./target-group/target-group.module"; @Global() @@ -30,11 +29,6 @@ export class BrevoModule { } } static register(config: BrevoModuleConfig): DynamicModule { - const TargetGroup = TargetGroupEntityFactory.create({ - Scope: config.emailCampaigns.Scope, - BrevoFilterAttributes: config.brevo.BrevoContactFilterAttributes, - }); - const BrevoConfig = BrevoConfigEntityFactory.create({ Scope: config.emailCampaigns.Scope, }); @@ -46,18 +40,19 @@ export class BrevoModule { BrevoContactModule.register({ BrevoContactAttributes: config.brevo.BrevoContactAttributes, Scope: config.emailCampaigns.Scope, - TargetGroup, + TargetGroup: config.brevo.TargetGroup, }), EmailCampaignModule.register({ EmailCampaignContentBlock: config.emailCampaigns.EmailCampaignContentBlock, Scope: config.emailCampaigns.Scope, - TargetGroup, + TargetGroup: config.brevo.TargetGroup, + EmailCampaign: config.brevo.EmailCampaign, BrevoConfig, }), TargetGroupModule.register({ Scope: config.emailCampaigns.Scope, BrevoFilterAttributes: config.brevo.BrevoContactFilterAttributes, - TargetGroup: TargetGroup, + TargetGroup: config.brevo.TargetGroup, }), BrevoConfigModule.register({ BrevoConfig, Scope: config.emailCampaigns.Scope }), ConfigModule.forRoot(config), diff --git a/packages/api/src/config/brevo-module.config.ts b/packages/api/src/config/brevo-module.config.ts index e11995da..8fb0df1a 100644 --- a/packages/api/src/config/brevo-module.config.ts +++ b/packages/api/src/config/brevo-module.config.ts @@ -1,5 +1,7 @@ import { Block } from "@comet/blocks-api"; import { Type } from "@nestjs/common"; +import { EmailCampaignInterface } from "src/email-campaign/entities/email-campaign-entity.factory"; +import { TargetGroupInterface } from "src/target-group/entity/target-group-entity.factory"; import { BrevoContactAttributesInterface, EmailCampaignScopeInterface } from "src/types"; import { BrevoContactFilterAttributesInterface } from "../types"; @@ -14,6 +16,8 @@ export interface BrevoModuleConfig { }; BrevoContactAttributes?: Type; BrevoContactFilterAttributes?: Type; + EmailCampaign: Type; + TargetGroup: Type; }; ecgRtrList: { apiKey: string; diff --git a/packages/api/src/email-campaign/email-campaign.module.ts b/packages/api/src/email-campaign/email-campaign.module.ts index b130633d..533b8070 100644 --- a/packages/api/src/email-campaign/email-campaign.module.ts +++ b/packages/api/src/email-campaign/email-campaign.module.ts @@ -12,23 +12,19 @@ import { EmailCampaignScopeInterface } from "../types"; import { EmailCampaignInputFactory } from "./dto/email-campaign-input.factory"; import { createEmailCampaignsResolver } from "./email-campaign.resolver"; import { EmailCampaignsService } from "./email-campaigns.service"; -import { EmailCampaignEntityFactory } from "./entities/email-campaign-entity.factory"; +import { EmailCampaignInterface } from "./entities/email-campaign-entity.factory"; interface EmailCampaignModuleConfig { Scope: Type; EmailCampaignContentBlock: Block; TargetGroup: Type; + EmailCampaign: Type; BrevoConfig: Type; } @Module({}) export class EmailCampaignModule { - static register({ Scope, EmailCampaignContentBlock, TargetGroup, BrevoConfig }: EmailCampaignModuleConfig): DynamicModule { - const EmailCampaign = EmailCampaignEntityFactory.create({ - Scope, - EmailCampaignContentBlock, - TargetGroup, - }); + static register({ Scope, EmailCampaignContentBlock, TargetGroup, EmailCampaign, BrevoConfig }: EmailCampaignModuleConfig): DynamicModule { const [EmailCampaignInput, EmailCampaignUpdateInput] = EmailCampaignInputFactory.create({ EmailCampaignContentBlock }); const EmailCampaignsResolver = createEmailCampaignsResolver({ EmailCampaign, diff --git a/packages/api/src/email-campaign/entities/email-campaign-entity.factory.ts b/packages/api/src/email-campaign/entities/email-campaign-entity.factory.ts index dc4d8a7c..4dde972c 100644 --- a/packages/api/src/email-campaign/entities/email-campaign-entity.factory.ts +++ b/packages/api/src/email-campaign/entities/email-campaign-entity.factory.ts @@ -24,73 +24,71 @@ export interface EmailCampaignInterface { targetGroups: Collection; } -export class EmailCampaignEntityFactory { - static create({ - EmailCampaignContentBlock, - Scope, - TargetGroup, - }: { - EmailCampaignContentBlock: Block; - Scope: EmailCampaignScopeInterface; - TargetGroup: Type; - }): Type { - @Entity() - @ObjectType({ - implements: () => [DocumentInterface], - }) - class EmailCampaign implements EmailCampaignInterface, DocumentInterface { - [OptionalProps]?: "createdAt" | "updatedAt"; - - @PrimaryKey({ columnType: "uuid" }) - @Field(() => ID) - id: string = v4(); +export function createEmailCampaignEntity({ + EmailCampaignContentBlock, + Scope, + TargetGroup, +}: { + EmailCampaignContentBlock: Block; + Scope: EmailCampaignScopeInterface; + TargetGroup: Type; +}): Type { + @Entity() + @ObjectType({ + implements: () => [DocumentInterface], + }) + class EmailCampaign implements EmailCampaignInterface, DocumentInterface { + [OptionalProps]?: "createdAt" | "updatedAt"; - @Property({ - columnType: "timestamp with time zone", - }) - @Field() - createdAt: Date = new Date(); + @PrimaryKey({ columnType: "uuid" }) + @Field(() => ID) + id: string = v4(); - @Property({ - columnType: "timestamp with time zone", - onUpdate: () => new Date(), - }) - @Field() - updatedAt: Date = new Date(); + @Property({ + columnType: "timestamp with time zone", + }) + @Field() + createdAt: Date = new Date(); - @Property({ columnType: "text" }) - @Field() - title: string; + @Property({ + columnType: "timestamp with time zone", + onUpdate: () => new Date(), + }) + @Field() + updatedAt: Date = new Date(); - @Property({ columnType: "text" }) - @Field() - subject: string; + @Property({ columnType: "text" }) + @Field() + title: string; - @Property({ columnType: "int", nullable: true }) - @Field(() => Int, { nullable: true }) - brevoId?: number; + @Property({ columnType: "text" }) + @Field() + subject: string; - @Enum(() => SendingState) - sendingState: SendingState; + @Property({ columnType: "int", nullable: true }) + @Field(() => Int, { nullable: true }) + brevoId?: number; - @Property({ columnType: "timestamp with time zone", nullable: true }) - @Field(() => Date, { nullable: true }) - scheduledAt?: Date; + @Enum(() => SendingState) + sendingState: SendingState; - @ManyToMany(() => TargetGroup, (targetGroup) => targetGroup.campaigns, { owner: true }) - @Field(() => [TargetGroup]) - targetGroups = new Collection(this); + @Property({ columnType: "timestamp with time zone", nullable: true }) + @Field(() => Date, { nullable: true }) + scheduledAt?: Date; - @RootBlock(EmailCampaignContentBlock) - @Property({ customType: new RootBlockType(EmailCampaignContentBlock) }) - @Field(() => RootBlockDataScalar(EmailCampaignContentBlock)) - content: BlockDataInterface; + @ManyToMany(() => TargetGroup, (targetGroup) => targetGroup.campaigns, { owner: true }) + @Field(() => [TargetGroup]) + targetGroups = new Collection(this); - @Embedded(() => Scope) - @Field(() => Scope) - scope: typeof Scope; - } + @RootBlock(EmailCampaignContentBlock) + @Property({ customType: new RootBlockType(EmailCampaignContentBlock) }) + @Field(() => RootBlockDataScalar(EmailCampaignContentBlock)) + content: BlockDataInterface; - return EmailCampaign; + @Embedded(() => Scope) + @Field(() => Scope) + scope: typeof Scope; } + + return EmailCampaign; } diff --git a/packages/api/src/target-group/entity/target-group-entity.factory.ts b/packages/api/src/target-group/entity/target-group-entity.factory.ts index f5c4a814..c9f9e3e6 100644 --- a/packages/api/src/target-group/entity/target-group-entity.factory.ts +++ b/packages/api/src/target-group/entity/target-group-entity.factory.ts @@ -23,84 +23,82 @@ export interface TargetGroupInterface { isTestList: boolean; } -export class TargetGroupEntityFactory { - static create({ - Scope, - BrevoFilterAttributes, - }: { - Scope: Type; - BrevoFilterAttributes?: Type; - }): Type { - @Entity({ abstract: true }) - @ObjectType({ - implements: () => [DocumentInterface], - isAbstract: true, - }) - class TargetGroupBase implements TargetGroupInterface, DocumentInterface { - [OptionalProps]?: "createdAt" | "updatedAt" | "totalSubscribers"; - - @PrimaryKey({ columnType: "uuid" }) - @Field(() => ID) - id: string = v4(); - - @Property({ columnType: "timestamp with time zone" }) - @Field() - createdAt: Date = new Date(); - - @Property({ columnType: "timestamp with time zone", onUpdate: () => new Date() }) - @Field() - updatedAt: Date = new Date(); - - @Property({ columnType: "text" }) - @Field() - title: string; - - @Property({ columnType: "boolean" }) - @Field() - isMainList: boolean; - - @Property({ columnType: "boolean" }) - @Field() - isTestList: boolean; - - @Property({ columnType: "int" }) - @Field(() => Int) - brevoId: number; - - @Field(() => Int) - totalSubscribers: number; - - @Embedded(() => Scope) - @Field(() => Scope) - scope: typeof Scope; - - @Property({ columnType: "int", nullable: true }) - @Field(() => Int, { nullable: true }) - assignedContactsTargetGroupBrevoId?: number; - - @ManyToMany("EmailCampaign", "targetGroups") - campaigns = new Collection(this); - } - if (BrevoFilterAttributes) { - @Entity() - @ObjectType({ - implements: () => [DocumentInterface], - }) - class TargetGroup extends TargetGroupBase { - @Embedded(() => BrevoFilterAttributes, { nullable: true }) - @Field(() => BrevoFilterAttributes, { nullable: true }) - filters?: BrevoContactFilterAttributesInterface; - } - - return TargetGroup; - } - +export function createTargetGroupEntity({ + Scope, + BrevoFilterAttributes, +}: { + Scope: Type; + BrevoFilterAttributes?: Type; +}): Type { + @Entity({ abstract: true }) + @ObjectType({ + implements: () => [DocumentInterface], + isAbstract: true, + }) + class TargetGroupBase implements TargetGroupInterface, DocumentInterface { + [OptionalProps]?: "createdAt" | "updatedAt" | "totalSubscribers"; + + @PrimaryKey({ columnType: "uuid" }) + @Field(() => ID) + id: string = v4(); + + @Property({ columnType: "timestamp with time zone" }) + @Field() + createdAt: Date = new Date(); + + @Property({ columnType: "timestamp with time zone", onUpdate: () => new Date() }) + @Field() + updatedAt: Date = new Date(); + + @Property({ columnType: "text" }) + @Field() + title: string; + + @Property({ columnType: "boolean" }) + @Field() + isMainList: boolean; + + @Property({ columnType: "boolean" }) + @Field() + isTestList: boolean; + + @Property({ columnType: "int" }) + @Field(() => Int) + brevoId: number; + + @Field(() => Int) + totalSubscribers: number; + + @Embedded(() => Scope) + @Field(() => Scope) + scope: typeof Scope; + + @Property({ columnType: "int", nullable: true }) + @Field(() => Int, { nullable: true }) + assignedContactsTargetGroupBrevoId?: number; + + @ManyToMany("EmailCampaign", "targetGroups") + campaigns = new Collection(this); + } + if (BrevoFilterAttributes) { @Entity() @ObjectType({ implements: () => [DocumentInterface], }) - class TargetGroup extends TargetGroupBase {} + class TargetGroup extends TargetGroupBase { + @Embedded(() => BrevoFilterAttributes, { nullable: true }) + @Field(() => BrevoFilterAttributes, { nullable: true }) + filters?: BrevoContactFilterAttributesInterface; + } return TargetGroup; } + + @Entity() + @ObjectType({ + implements: () => [DocumentInterface], + }) + class TargetGroup extends TargetGroupBase {} + + return TargetGroup; } From e931996b986b1300c649e3c4de7f18cad90ac95e Mon Sep 17 00:00:00 2001 From: juliawegmayr <109900447+juliawegmayr@users.noreply.github.com> Date: Wed, 18 Dec 2024 14:47:29 +0100 Subject: [PATCH 110/121] Add doi template id to config (#113) Co-authored-by: Julia Wegmayr --- .changeset/funny-glasses-rhyme.md | 8 + README.md | 2 +- demo/api/schema.gql | 25 + demo/api/src/app.module.ts | 2 - demo/api/src/config/config.ts | 1 - demo/api/src/config/environment-variables.ts | 6 +- .../brevoConfiguration/BrevoConfigForm.gql.ts | 10 + .../brevoConfiguration/BrevoConfigForm.tsx | 88 ++- packages/api/schema.gql | 541 ++++++++++-------- .../brevo-api-transactional-mails.service.ts | 16 + .../dto/brevo-api-email-templates-list.ts | 61 ++ .../src/brevo-config/brevo-config.resolver.ts | 35 ++ .../brevo-config/dto/brevo-config.input.ts | 4 + .../entities/brevo-config-entity.factory.ts | 5 + .../brevo-contact-import.service.ts | 6 +- .../src/brevo-contact/brevo-contact.module.ts | 2 +- .../brevo-contact/brevo-contact.resolver.ts | 6 +- .../brevo-contact/brevo-contacts.service.ts | 8 +- .../api/src/config/brevo-module.config.ts | 1 - .../migrations/Migration20241018110515.ts | 7 + .../src/mikro-orm/migrations/migrations.ts | 2 + 21 files changed, 575 insertions(+), 261 deletions(-) create mode 100644 .changeset/funny-glasses-rhyme.md create mode 100644 packages/api/src/brevo-api/dto/brevo-api-email-templates-list.ts create mode 100644 packages/api/src/mikro-orm/migrations/Migration20241018110515.ts diff --git a/.changeset/funny-glasses-rhyme.md b/.changeset/funny-glasses-rhyme.md new file mode 100644 index 00000000..a5e69b1d --- /dev/null +++ b/.changeset/funny-glasses-rhyme.md @@ -0,0 +1,8 @@ +--- +"@comet/brevo-admin": minor +"@comet/brevo-api": minor +--- + +Add field for `doubleOptInTemplateId` to `BrevoConfigPage` + +The environment variable BREVO_DOUBLE_OPT_IN_TEMPLATE_ID can be removed, as it is now available as a maintainable variable in the admin interface. diff --git a/README.md b/README.md index d6faf05b..f206275d 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,6 @@ The attribute naming must be identical to the naming in brevo The following variables must be set manually - `BREVO_API_KEY` -- `BREVO_DOUBLE_OPT_IN_TEMPLATE_ID` - `ECG_RTR_LIST_API_KEY` - `CAMPAIGN_BASIC_AUTH_USERNAME` - `CAMPAIGN_BASIC_AUTH_PASSWORD` @@ -36,6 +35,7 @@ The following variables must be set manually ### Configure brevo sender in the demo admin brevo config page - Brevo sender +- Brevo double opt-in template ### Start development processes diff --git a/demo/api/schema.gql b/demo/api/schema.gql index 40f47d66..e2ae8814 100644 --- a/demo/api/schema.gql +++ b/demo/api/schema.gql @@ -178,6 +178,27 @@ type PaginatedUserList { totalCount: Int! } +type BrevoApiEmailTemplateSender { + id: String + subject: String + email: String! +} + +type BrevoApiEmailTemplate { + id: ID! + name: String! + subject: String! + isActive: Boolean! + testSent: Boolean! + replyTo: String! + toField: String! + tag: String! + htmlContent: String! + createdAt: String! + modifiedAt: String! + sender: BrevoApiEmailTemplateSender! +} + type BrevoApiSender { id: ID! name: String! @@ -484,6 +505,7 @@ type BrevoConfig implements DocumentInterface { updatedAt: DateTime! senderMail: String! senderName: String! + doubleOptInTemplateId: Int! folderId: Int! createdAt: DateTime! scope: EmailCampaignContentScope! @@ -586,6 +608,7 @@ type Query { targetGroup(id: ID!): TargetGroup! targetGroups(scope: EmailCampaignContentScopeInput!, search: String, filter: TargetGroupFilter, sort: [TargetGroupSort!], offset: Int! = 0, limit: Int! = 25): PaginatedTargetGroups! senders(scope: EmailCampaignContentScopeInput!): [BrevoApiSender!] + doubleOptInTemplates: [BrevoApiEmailTemplate!] brevoConfig(scope: EmailCampaignContentScopeInput!): BrevoConfig } @@ -1009,11 +1032,13 @@ input TargetGroupUpdateInput { input BrevoConfigInput { senderMail: String! senderName: String! + doubleOptInTemplateId: Int! folderId: Int! } input BrevoConfigUpdateInput { senderMail: String senderName: String + doubleOptInTemplateId: Int folderId: Int } diff --git a/demo/api/src/app.module.ts b/demo/api/src/app.module.ts index afa605c9..91d86107 100644 --- a/demo/api/src/app.module.ts +++ b/demo/api/src/app.module.ts @@ -148,14 +148,12 @@ export class AppModule { if (scope.domain === "main") { return { apiKey: config.brevo.apiKey, - doubleOptInTemplateId: config.brevo.doubleOptInTemplateId, allowedRedirectUrl: config.brevo.allowedRedirectUrl, redirectUrlForImport: config.brevo.redirectUrlForImport, }; } else { return { apiKey: config.brevo.apiKey, - doubleOptInTemplateId: config.brevo.doubleOptInTemplateId, allowedRedirectUrl: config.brevo.allowedRedirectUrl, redirectUrlForImport: config.brevo.redirectUrlForImport, }; diff --git a/demo/api/src/config/config.ts b/demo/api/src/config/config.ts index e2c242e6..3de2d653 100644 --- a/demo/api/src/config/config.ts +++ b/demo/api/src/config/config.ts @@ -57,7 +57,6 @@ export function createConfig(processEnv: NodeJS.ProcessEnv) { }, brevo: { apiKey: envVars.BREVO_API_KEY, - doubleOptInTemplateId: envVars.BREVO_DOUBLE_OPT_IN_TEMPLATE_ID, allowedRedirectUrl: envVars.BREVO_ALLOWED_REDIRECT_URL, redirectUrlForImport: envVars.REDIRECT_URL_FOR_IMPORT, }, diff --git a/demo/api/src/config/environment-variables.ts b/demo/api/src/config/environment-variables.ts index 2192e9c7..96182425 100644 --- a/demo/api/src/config/environment-variables.ts +++ b/demo/api/src/config/environment-variables.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/naming-convention */ import { BlobStorageConfig } from "@comet/cms-api"; import { Transform, Type } from "class-transformer"; -import { IsBase64, IsBoolean, IsInt, IsNumber, IsOptional, IsString, MinLength, ValidateIf } from "class-validator"; +import { IsBase64, IsBoolean, IsInt, IsOptional, IsString, MinLength, ValidateIf } from "class-validator"; export class EnvironmentVariables { @IsString() @@ -115,10 +115,6 @@ export class EnvironmentVariables { @IsString() BREVO_API_KEY: string; - @IsNumber() - @Type(() => Number) - BREVO_DOUBLE_OPT_IN_TEMPLATE_ID: number; - @IsString() BREVO_ALLOWED_REDIRECT_URL: string; diff --git a/packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts b/packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts index 26384d01..81e7523c 100644 --- a/packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts +++ b/packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts @@ -4,6 +4,7 @@ export const brevoConfigFormFragment = gql` fragment BrevoConfigForm on BrevoConfig { senderMail senderName + doubleOptInTemplateId folderId } `; @@ -58,3 +59,12 @@ export const sendersSelectQuery = gql` } } `; + +export const doubleOptInTemplatesSelectQuery = gql` + query DoubleOptInTemplatesSelect { + doubleOptInTemplates { + id + name + } + } +`; diff --git a/packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx b/packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx index f946e052..a719cacb 100644 --- a/packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx +++ b/packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx @@ -22,12 +22,20 @@ import { FormApi } from "final-form"; import React from "react"; import { FormattedMessage } from "react-intl"; -import { brevoConfigFormQuery, createBrevoConfigMutation, sendersSelectQuery, updateBrevoConfigMutation } from "./BrevoConfigForm.gql"; +import { + brevoConfigFormQuery, + createBrevoConfigMutation, + doubleOptInTemplatesSelectQuery, + sendersSelectQuery, + updateBrevoConfigMutation, +} from "./BrevoConfigForm.gql"; import { GQLBrevoConfigFormQuery, GQLBrevoConfigFormQueryVariables, GQLCreateBrevoConfigMutation, GQLCreateBrevoConfigMutationVariables, + GQLDoubleOptInTemplatesSelectQuery, + GQLDoubleOptInTemplatesSelectQueryVariables, GQLSendersSelectQuery, GQLSendersSelectQueryVariables, GQLUpdateBrevoConfigMutation, @@ -40,6 +48,7 @@ interface Option { } type FormValues = { sender: Option; + doubleOptInTemplate: Option; folderId: number; }; @@ -56,6 +65,8 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { variables: { scope }, }); + const mode = data?.brevoConfig?.id ? "edit" : "add"; + const { data: sendersData, error: senderError, @@ -64,26 +75,55 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { variables: { scope }, }); + const { + data: doubleOptInTemplatesData, + error: doubleOptInTemplatesError, + loading: doubleOptInTemplatesLoading, + } = useQuery(doubleOptInTemplatesSelectQuery); + const senderOptions = sendersData?.senders?.map((sender) => ({ value: sender.email, label: `${sender.name} (${sender.email})`, })) ?? []; - const mode = data?.brevoConfig?.id ? "edit" : "add"; + const doubleOptInTemplateOptions = + doubleOptInTemplatesData?.doubleOptInTemplates?.map((doubleOptInTemplate) => ({ + value: doubleOptInTemplate.id, + label: `${doubleOptInTemplate.id}: ${doubleOptInTemplate.name}`, + })) ?? []; const initialValues = React.useMemo>(() => { const sender = sendersData?.senders?.find((s) => s.email === data?.brevoConfig?.senderMail && s.name === data?.brevoConfig?.senderName); - return sender - ? { - sender: { - value: sender.id, + + const doubleOptInTemplate = doubleOptInTemplatesData?.doubleOptInTemplates?.find( + (template) => template.id === data?.brevoConfig?.doubleOptInTemplateId?.toString(), + ); + + return { + sender: sender + ? { + value: sender.email, label: `${sender.name} (${sender.email})`, - }, - folderId: data?.brevoConfig?.folderId ?? 1, - } - : {}; - }, [data?.brevoConfig?.folderId, data?.brevoConfig?.senderMail, data?.brevoConfig?.senderName, sendersData?.senders]); + } + : undefined, + + doubleOptInTemplate: doubleOptInTemplate + ? { + value: doubleOptInTemplate?.id, + label: `${doubleOptInTemplate?.id}: ${doubleOptInTemplate?.name}`, + } + : undefined, + folderId: data?.brevoConfig?.folderId ?? 1, + }; + }, [ + data?.brevoConfig?.folderId, + data?.brevoConfig?.doubleOptInTemplateId, + data?.brevoConfig?.senderMail, + data?.brevoConfig?.senderName, + doubleOptInTemplatesData?.doubleOptInTemplates, + sendersData?.senders, + ]); const saveConflict = useFormSaveConflict({ checkConflict: async () => { @@ -115,13 +155,14 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { const sender = sendersData?.senders?.find((s) => s.email === state.sender.value); - if (!sender) { - throw new Error("No sender selected"); + if (!sender || !state.doubleOptInTemplate) { + throw new Error("Not all required fields are set"); } const output = { senderName: sender?.name, senderMail: sender?.email, + doubleOptInTemplateId: Number(state.doubleOptInTemplate.value), folderId: state.folderId ?? 1, }; @@ -149,9 +190,9 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { } }; - if (error || senderError) throw error ?? senderError; + if (error || senderError || doubleOptInTemplatesError) throw error ?? senderError ?? doubleOptInTemplatesError; - if (loading || senderLoading) { + if (loading || senderLoading || doubleOptInTemplatesLoading) { return ; } @@ -179,6 +220,23 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { name="sender" label={} fullWidth + required + /> + + option.label} + isOptionEqualToValue={(option: Option, value: Option) => option.value === value.value} + options={doubleOptInTemplateOptions} + name="doubleOptInTemplate" + label={ + + } + fullWidth + required /> ; @@ -52,4 +53,19 @@ export class BrevoTransactionalMailsService { handleBrevoError(error); } } + + public async getEmailTemplates(scope: EmailCampaignScopeInterface): Promise { + try { + const transactionalEmailsApi = this.getTransactionalEmailsApi(scope); + const { response, body } = await transactionalEmailsApi.getSmtpTemplates(true); + + if (response.statusCode !== 200) { + throw new Error("Failed to get templates"); + } + + return body as BrevoApiEmailTemplateList; + } catch (error) { + handleBrevoError(error); + } + } } diff --git a/packages/api/src/brevo-api/dto/brevo-api-email-templates-list.ts b/packages/api/src/brevo-api/dto/brevo-api-email-templates-list.ts new file mode 100644 index 00000000..90979b27 --- /dev/null +++ b/packages/api/src/brevo-api/dto/brevo-api-email-templates-list.ts @@ -0,0 +1,61 @@ +import { Field, ID, Int, ObjectType } from "@nestjs/graphql"; + +@ObjectType() +export class BrevoApiEmailTemplateList { + @Field(() => Int, { nullable: true }) + count?: number; + + @Field(() => Array(BrevoApiEmailTemplate), { nullable: true }) + templates?: Array; +} + +@ObjectType() +export class BrevoApiEmailTemplateSender { + @Field(() => String, { nullable: true }) + id?: string; + + @Field(() => String, { nullable: true }) + subject?: string; + + @Field(() => String) + email: string; +} + +@ObjectType() +export class BrevoApiEmailTemplate { + @Field(() => ID) + id: number; + + @Field(() => String) + name: string; + + @Field(() => String) + subject: string; + + @Field() + isActive: boolean; + + @Field() + testSent: boolean; + + @Field(() => String) + replyTo: string; + + @Field(() => String) + toField: string; + + @Field(() => String) + tag: string; + + @Field(() => String) + htmlContent: string; + + @Field(() => String) + createdAt: string; + + @Field(() => String) + modifiedAt: string; + + @Field(() => BrevoApiEmailTemplateSender) + sender: BrevoApiEmailTemplateSender; +} diff --git a/packages/api/src/brevo-config/brevo-config.resolver.ts b/packages/api/src/brevo-config/brevo-config.resolver.ts index 07ec220e..c04ab617 100644 --- a/packages/api/src/brevo-config/brevo-config.resolver.ts +++ b/packages/api/src/brevo-config/brevo-config.resolver.ts @@ -5,6 +5,8 @@ import { Type } from "@nestjs/common"; import { Args, ID, Mutation, Query, Resolver } from "@nestjs/graphql"; import { BrevoApiSenderService } from "../brevo-api/brevo-api-sender.service"; +import { BrevoTransactionalMailsService } from "../brevo-api/brevo-api-transactional-mails.service"; +import { BrevoApiEmailTemplate } from "../brevo-api/dto/brevo-api-email-templates-list"; import { BrevoApiSender } from "../brevo-api/dto/brevo-api-sender"; import { EmailCampaignScopeInterface } from "../types"; import { DynamicDtoValidationPipe } from "../validation/dynamic-dto-validation.pipe"; @@ -24,6 +26,7 @@ export function createBrevoConfigResolver({ constructor( private readonly entityManager: EntityManager, private readonly brevoSenderApiService: BrevoApiSenderService, + private readonly brevoTransactionalEmailsApiService: BrevoTransactionalMailsService, @InjectRepository(BrevoConfig) private readonly repository: EntityRepository, ) {} @@ -37,6 +40,17 @@ export function createBrevoConfigResolver({ return false; } + private async isValidTemplateId({ templateId }: { templateId: number }): Promise { + const { templates } = await this.brevoTransactionalEmailsApiService.getEmailTemplates(Scope); + + if (templates && templates.some((template) => template.id === templateId)) { + return true; + } + + return false; + } + + @RequiredPermission(["brevo-newsletter-config"], { skipScopeCheck: true }) @Query(() => [BrevoApiSender], { nullable: true }) async senders( @Args("scope", { type: () => Scope }, new DynamicDtoValidationPipe(Scope)) @@ -46,6 +60,14 @@ export function createBrevoConfigResolver({ return senders; } + @RequiredPermission(["brevo-newsletter-config"], { skipScopeCheck: true }) + @Query(() => [BrevoApiEmailTemplate], { nullable: true }) + async doubleOptInTemplates(): Promise | undefined> { + const { templates } = await this.brevoTransactionalEmailsApiService.getEmailTemplates(Scope); + const doubleOptInTemplates = templates?.filter((template) => template.tag === "optin" && template.isActive); + return doubleOptInTemplates; + } + @Query(() => BrevoConfig, { nullable: true }) async brevoConfig( @Args("scope", { type: () => Scope }, new DynamicDtoValidationPipe(Scope)) @@ -65,6 +87,10 @@ export function createBrevoConfigResolver({ throw new Error("Sender not found"); } + if (!(await this.isValidTemplateId({ templateId: input.doubleOptInTemplateId }))) { + throw new Error("Template ID is not valid. "); + } + const brevoConfig = this.repository.create({ ...input, scope, @@ -89,12 +115,21 @@ export function createBrevoConfigResolver({ } } + if (input.doubleOptInTemplateId) { + if (!(await this.isValidTemplateId({ templateId: input.doubleOptInTemplateId }))) { + throw new Error("Template ID is not valid. "); + } + } + if (lastUpdatedAt) { validateNotModified(brevoConfig, lastUpdatedAt); } wrap(brevoConfig).assign({ ...input, + senderMail: input.senderMail, + senderName: input.senderName, + doubleOptInTemplateId: input.doubleOptInTemplateId, }); await this.entityManager.flush(); diff --git a/packages/api/src/brevo-config/dto/brevo-config.input.ts b/packages/api/src/brevo-config/dto/brevo-config.input.ts index 746a1f45..e3ed1657 100644 --- a/packages/api/src/brevo-config/dto/brevo-config.input.ts +++ b/packages/api/src/brevo-config/dto/brevo-config.input.ts @@ -15,6 +15,10 @@ export class BrevoConfigInput { @Field() senderName: string; + @IsInt() + @Field(() => Int) + doubleOptInTemplateId: number; + @Field(() => Int) @IsInt() folderId: number; diff --git a/packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts b/packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts index c093a39d..12d59036 100644 --- a/packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts +++ b/packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts @@ -11,6 +11,7 @@ export interface BrevoConfigInterface { id: string; senderName: string; senderMail: string; + doubleOptInTemplateId: number; folderId: number; createdAt: Date; updatedAt: Date; @@ -38,6 +39,10 @@ export class BrevoConfigEntityFactory { @Field() senderName: string; + @Property({ columnType: "number" }) + @Field(() => Int) + doubleOptInTemplateId: number; + @Property({ columnType: "int" }) @Field(() => Int) folderId: number; diff --git a/packages/api/src/brevo-contact/brevo-contact-import.service.ts b/packages/api/src/brevo-contact/brevo-contact-import.service.ts index b42e193e..2388b0b8 100644 --- a/packages/api/src/brevo-contact/brevo-contact-import.service.ts +++ b/packages/api/src/brevo-contact/brevo-contact-import.service.ts @@ -5,6 +5,7 @@ import { Inject, Injectable } from "@nestjs/common"; import { Field, Int, ObjectType } from "@nestjs/graphql"; import { IsEmail, IsNotEmpty, validateSync } from "class-validator"; import isEqual from "lodash.isequal"; +import { BrevoConfigInterface } from "src/brevo-config/entities/brevo-config-entity.factory"; import { TargetGroupInterface } from "src/target-group/entity/target-group-entity.factory"; import { Readable } from "stream"; @@ -57,6 +58,7 @@ export class BrevoContactImportService { private readonly brevoContactsService: BrevoContactsService, private readonly targetGroupsService: TargetGroupsService, @InjectRepository("TargetGroup") private readonly targetGroupRepository: EntityRepository, + @InjectRepository("BrevoConfig") private readonly brevoConfigRepository: EntityRepository, ) {} async importContactsFromCsv({ @@ -150,10 +152,12 @@ export class BrevoContactImportService { ); if (updatedBrevoContact) return "updated"; } else if (!brevoContact) { + const brevoConfig = await this.brevoConfigRepository.findOneOrFail({ scope }); + const success = await this.brevoContactsService.createDoubleOptInContact({ ...contact, scope, - templateId: this.config.brevo.resolveConfig(scope).doubleOptInTemplateId, + templateId: brevoConfig.doubleOptInTemplateId, listIds: [mainTargetGroupForScope.brevoId, ...targetGroupBrevoIds], }); if (success) return "created"; diff --git a/packages/api/src/brevo-contact/brevo-contact.module.ts b/packages/api/src/brevo-contact/brevo-contact.module.ts index e59d379f..662a02f0 100644 --- a/packages/api/src/brevo-contact/brevo-contact.module.ts +++ b/packages/api/src/brevo-contact/brevo-contact.module.ts @@ -47,7 +47,7 @@ export class BrevoContactModule { return { module: BrevoContactModule, - imports: [BrevoApiModule, ConfigModule, MikroOrmModule.forFeature([TargetGroup, FileUpload])], + imports: [BrevoApiModule, ConfigModule, MikroOrmModule.forFeature([TargetGroup, FileUpload, "BrevoConfig"])], providers: [ BrevoContactImportService, BrevoContactsService, diff --git a/packages/api/src/brevo-contact/brevo-contact.resolver.ts b/packages/api/src/brevo-contact/brevo-contact.resolver.ts index 02c5a07c..5334baee 100644 --- a/packages/api/src/brevo-contact/brevo-contact.resolver.ts +++ b/packages/api/src/brevo-contact/brevo-contact.resolver.ts @@ -3,6 +3,7 @@ import { EntityRepository, FilterQuery } from "@mikro-orm/core"; import { InjectRepository } from "@mikro-orm/nestjs"; import { Inject, Type } from "@nestjs/common"; import { Args, ArgsType, Int, Mutation, ObjectType, Query, Resolver } from "@nestjs/graphql"; +import { BrevoConfigInterface } from "src/brevo-config/entities/brevo-config-entity.factory"; import { BrevoApiContactsService } from "../brevo-api/brevo-api-contact.service"; import { BrevoModuleConfig } from "../config/brevo-module.config"; @@ -47,6 +48,7 @@ export function createBrevoContactResolver({ class BrevoContactResolver { constructor( @Inject(BREVO_MODULE_CONFIG) private readonly config: BrevoModuleConfig, + @InjectRepository("BrevoConfig") private readonly brevoConfigRepository: EntityRepository, private readonly brevoContactsApiService: BrevoApiContactsService, private readonly brevoContactsService: BrevoContactsService, private readonly ecgRtrListService: EcgRtrListService, @@ -211,12 +213,14 @@ export function createBrevoContactResolver({ return SubscribeResponse.ERROR_CONTAINED_IN_ECG_RTR_LIST; } + const brevoConfig = await this.brevoConfigRepository.findOneOrFail({ scope }); + const created = await this.brevoContactsService.createDoubleOptInContact({ email: input.email, attributes: input.attributes, redirectionUrl: input.redirectionUrl, scope, - templateId: this.config.brevo.resolveConfig(scope).doubleOptInTemplateId, + templateId: brevoConfig.doubleOptInTemplateId, }); if (created) { diff --git a/packages/api/src/brevo-contact/brevo-contacts.service.ts b/packages/api/src/brevo-contact/brevo-contacts.service.ts index 298b70c5..71d55324 100644 --- a/packages/api/src/brevo-contact/brevo-contacts.service.ts +++ b/packages/api/src/brevo-contact/brevo-contacts.service.ts @@ -1,4 +1,7 @@ +import { EntityRepository } from "@mikro-orm/core"; +import { InjectRepository } from "@mikro-orm/nestjs"; import { Inject, Injectable } from "@nestjs/common"; +import { BrevoConfigInterface } from "src/brevo-config/entities/brevo-config-entity.factory"; import { BrevoApiContactsService } from "../brevo-api/brevo-api-contact.service"; import { BrevoModuleConfig } from "../config/brevo-module.config"; @@ -14,6 +17,7 @@ import { EcgRtrListService } from "./ecg-rtr-list/ecg-rtr-list.service"; export class BrevoContactsService { constructor( @Inject(BREVO_MODULE_CONFIG) private readonly config: BrevoModuleConfig, + @InjectRepository("BrevoConfig") private readonly brevoConfigRepository: EntityRepository, private readonly brevoContactsApiService: BrevoApiContactsService, private readonly ecgRtrListService: EcgRtrListService, private readonly targetGroupService: TargetGroupsService, @@ -106,10 +110,12 @@ export class BrevoContactsService { return SubscribeResponse.ERROR_CONTAINED_IN_ECG_RTR_LIST; } + const brevoConfig = await this.brevoConfigRepository.findOneOrFail({ scope }); + const created = await this.createDoubleOptInContact({ ...data, scope, - templateId: this.config.brevo.resolveConfig(scope).doubleOptInTemplateId, + templateId: brevoConfig.doubleOptInTemplateId, }); if (created) { diff --git a/packages/api/src/config/brevo-module.config.ts b/packages/api/src/config/brevo-module.config.ts index 8fb0df1a..d75144f3 100644 --- a/packages/api/src/config/brevo-module.config.ts +++ b/packages/api/src/config/brevo-module.config.ts @@ -10,7 +10,6 @@ export interface BrevoModuleConfig { brevo: { resolveConfig: (scope: EmailCampaignScopeInterface) => { apiKey: string; - doubleOptInTemplateId: number; allowedRedirectUrl: string; redirectUrlForImport: string; }; diff --git a/packages/api/src/mikro-orm/migrations/Migration20241018110515.ts b/packages/api/src/mikro-orm/migrations/Migration20241018110515.ts new file mode 100644 index 00000000..d1fabbfa --- /dev/null +++ b/packages/api/src/mikro-orm/migrations/Migration20241018110515.ts @@ -0,0 +1,7 @@ +import { Migration } from "@mikro-orm/migrations"; + +export class Migration20241018110515 extends Migration { + async up(): Promise { + this.addSql('alter table "BrevoConfig" add column "doubleOptInTemplateId" int;'); + } +} diff --git a/packages/api/src/mikro-orm/migrations/migrations.ts b/packages/api/src/mikro-orm/migrations/migrations.ts index c6c16bdd..0527a326 100644 --- a/packages/api/src/mikro-orm/migrations/migrations.ts +++ b/packages/api/src/mikro-orm/migrations/migrations.ts @@ -10,6 +10,7 @@ import { Migration20240621102349 } from "./Migration20240621102349"; import { Migration20240819214939 } from "./Migration20240819214939"; import { Migration20240830112400 } from "./Migration20240830112400"; import { Migration20241016123307 } from "./Migration20241016123307"; +import { Migration20241018110515 } from "./Migration20241018110515"; import { Migration20241119101706 } from "./Migration20241119101706"; export const migrationsList: MigrationObject[] = [ @@ -23,5 +24,6 @@ export const migrationsList: MigrationObject[] = [ { name: "Migration20240819214939", class: Migration20240819214939 }, { name: "Migration20240830112400", class: Migration20240830112400 }, { name: "Migration20241016123307", class: Migration20241016123307 }, + { name: "Migration20241018110515", class: Migration20241018110515 }, { name: "Migration20241119101706", class: Migration20241119101706 }, ]; From dc512ad3c60eafb216ea107ab7c0db2cb4baae2b Mon Sep 17 00:00:00 2001 From: juliawegmayr <109900447+juliawegmayr@users.noreply.github.com> Date: Thu, 19 Dec 2024 09:19:38 +0100 Subject: [PATCH 111/121] Setup `@comet/brevo-mail-rendering` package (#223) Co-authored-by: Julia Wegmayr Co-authored-by: Johannes Obermair --- demo/campaign/package.json | 1 + dev-pm.config.js | 7 + package.json | 13 ++ packages/mail-rendering/.eslintrc.json | 19 ++ packages/mail-rendering/.gitignore | 1 + packages/mail-rendering/lint-staged.config.js | 5 + packages/mail-rendering/package.json | 43 +++++ .../mail-rendering/src/blocks/ImageBlock.tsx | 3 + packages/mail-rendering/src/index.ts | 1 + packages/mail-rendering/tsconfig.build.json | 4 + packages/mail-rendering/tsconfig.json | 16 ++ pnpm-lock.yaml | 165 +++++++++++++++--- 12 files changed, 251 insertions(+), 27 deletions(-) create mode 100644 packages/mail-rendering/.eslintrc.json create mode 100644 packages/mail-rendering/.gitignore create mode 100644 packages/mail-rendering/lint-staged.config.js create mode 100644 packages/mail-rendering/package.json create mode 100644 packages/mail-rendering/src/blocks/ImageBlock.tsx create mode 100644 packages/mail-rendering/src/index.ts create mode 100644 packages/mail-rendering/tsconfig.build.json create mode 100644 packages/mail-rendering/tsconfig.json diff --git a/demo/campaign/package.json b/demo/campaign/package.json index be791557..e6fd12a8 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -19,6 +19,7 @@ "serve": "NODE_ENV=production node server.js" }, "dependencies": { + "@comet/brevo-mail-rendering": "workspace:*", "@comet/cms-site": "^7.7.0", "@faire/mjml-react": "^3.4.0", "@luma-team/mjml-react": "^0.2.1", diff --git a/dev-pm.config.js b/dev-pm.config.js index 0c00d3b3..cc4c2d4d 100644 --- a/dev-pm.config.js +++ b/dev-pm.config.js @@ -1,6 +1,7 @@ const packageFolderMapping = { "@comet/brevo-api": "packages/api", "@comet/brevo-admin": "packages/admin", + "@comet/brevo-mail-rendering": "packages/brevo-mail-rendering", }; const waitOnPackages = (...packages) => { @@ -26,6 +27,12 @@ module.exports = { script: "pnpm --filter @comet/brevo-admin run start", group: ["admin"], }, + //group mail-rendering + { + name: "mail-rendering", + script: "pnpm --filter @comet/brevo-mail-rendering run dev", + group: ["mail-rendering"], + }, //group demo admin { name: "demo-admin", diff --git a/package.json b/package.json index d81f3ada..0d8a9131 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,10 @@ "build:packages": "pnpm run build", "build:api": "pnpm recursive --filter '@comet/brevo-api' run build", "build:admin": "pnpm recursive --filter '@comet/brevo-admin' run build", + "build:mail-rendering": "pnpm recursive --filter '@comet/brevo-mail-rendering' run build", "build:api:skippable": "test -f packages/api/lib/index.d.ts && echo 'Skipping API build' || $npm_execpath build:api", "build:admin:skippable": "test -f packages/admin/lib/index.d.ts && echo 'Skipping Admin build' || $npm_execpath build:admin", + "build:mail-rendering:skippable": "test -f packages/mail-rendering/lib/index.d.ts && echo 'Skipping Mail-Rendering build' || $npm_execpath build:mail-rendering", "build:lib": "pnpm recursive --filter '@comet/*' run build", "clean": "pnpm recursive run clean", "copy-schema-files": "node copy-schema-files.js", @@ -17,6 +19,7 @@ "dev:demo:site": "dotenv -c -- dev-pm start @demo-site", "dev:api": "pnpm recursive --filter '@comet/brevo-api' run clean && dotenv -c -- dev-pm start @api", "dev:admin": "pnpm recursive --filter '@comet/brevo-admin' run clean && dotenv -c -- dev-pm start @admin", + "dev:mail-rendering": "pnpm recursive --filter '@comet/brevo-mail-rendering' run clean && dotenv -c -- dev-pm start @mail-rendering", "postinstall": "husky install", "lint": "pnpm lint:root && pnpm recursive run lint", "lint:root": "$npm_execpath prettier --check './!(demo|packages)/**/*.{js,json,md,yml,yaml}'", @@ -66,6 +69,16 @@ "peerDependencies": { "@types/react": "*" } + }, + "@types/hoist-non-react-statics": { + "peerDependencies": { + "@types/react": "*" + } + }, + "@types/react-transition-group": { + "peerDependencies": { + "@types/react": "^17.0.0" + } } } } diff --git a/packages/mail-rendering/.eslintrc.json b/packages/mail-rendering/.eslintrc.json new file mode 100644 index 00000000..da37bd23 --- /dev/null +++ b/packages/mail-rendering/.eslintrc.json @@ -0,0 +1,19 @@ +{ + "extends": "@comet/eslint-config/react", + "ignorePatterns": ["src/*.generated.ts", "lib/**"], + "rules": { + "@comet/no-other-module-relative-import": "off", + "react/react-in-jsx-scope": "off", + "no-restricted-imports": [ + "error", + { + "paths": [ + { + "name": "react", + "importNames": ["default"] + } + ] + } + ] + } +} diff --git a/packages/mail-rendering/.gitignore b/packages/mail-rendering/.gitignore new file mode 100644 index 00000000..7951405f --- /dev/null +++ b/packages/mail-rendering/.gitignore @@ -0,0 +1 @@ +lib \ No newline at end of file diff --git a/packages/mail-rendering/lint-staged.config.js b/packages/mail-rendering/lint-staged.config.js new file mode 100644 index 00000000..79e0324f --- /dev/null +++ b/packages/mail-rendering/lint-staged.config.js @@ -0,0 +1,5 @@ +module.exports = { + "src/**/*.{ts,tsx,js,jsx,json,css,scss,md}": () => "pnpm lint:eslint", + "src/**/*.{ts,tsx}": () => "pnpm lint:tsc", + "*.{js,json,md,yml,yaml}": () => "pnpm lint:prettier", +}; diff --git a/packages/mail-rendering/package.json b/packages/mail-rendering/package.json new file mode 100644 index 00000000..396c8da9 --- /dev/null +++ b/packages/mail-rendering/package.json @@ -0,0 +1,43 @@ +{ + "name": "@comet/brevo-mail-rendering", + "version": "2.1.6", + "repository": { + "type": "git", + "url": "https://github.com/vivid-planet/comet-brevo-module/", + "directory": "packages/mail-rendering" + }, + "license": "BSD-2-Clause", + "main": "lib/index.js", + "types": "lib/index.d.ts", + "files": [ + "lib/*" + ], + "scripts": { + "build": "$npm_execpath run clean && tsc -p tsconfig.build.json", + "clean": "rimraf lib", + "dev": "tsc --watch --preserveWatchOutput -p tsconfig.build.json", + "lint": "run-p lint:eslint lint:prettier 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" + }, + "devDependencies": { + "@comet/eslint-config": "^7.7.0", + "@types/react": "^18.3.12", + "@types/react-dom": "^18.3.1", + "eslint": "^8.0.0", + "npm-run-all2": "^5.0.2", + "react": "^18.3.1", + "react-dom": "^18.3.1", + "rimraf": "^6.0.1", + "typescript": "^4.9.5" + }, + "peerDependencies": { + "react": "^18.0.0", + "react-dom": "^18.0.0" + }, + "publishConfig": { + "access": "public", + "registry": "https://registry.npmjs.org" + } +} diff --git a/packages/mail-rendering/src/blocks/ImageBlock.tsx b/packages/mail-rendering/src/blocks/ImageBlock.tsx new file mode 100644 index 00000000..6590ec2e --- /dev/null +++ b/packages/mail-rendering/src/blocks/ImageBlock.tsx @@ -0,0 +1,3 @@ +export const ImageBlock = () => { + return null; +}; diff --git a/packages/mail-rendering/src/index.ts b/packages/mail-rendering/src/index.ts new file mode 100644 index 00000000..34f3adf0 --- /dev/null +++ b/packages/mail-rendering/src/index.ts @@ -0,0 +1 @@ +export { ImageBlock } from "./blocks/ImageBlock"; diff --git a/packages/mail-rendering/tsconfig.build.json b/packages/mail-rendering/tsconfig.build.json new file mode 100644 index 00000000..a7ccb8d7 --- /dev/null +++ b/packages/mail-rendering/tsconfig.build.json @@ -0,0 +1,4 @@ +{ + "extends": "./tsconfig.json", + "exclude": ["**/*.test.tsx", "**/*.test.ts", "**/*.spec.tsx", "**/*.spec.ts", "**/__tests__/**"] +} diff --git a/packages/mail-rendering/tsconfig.json b/packages/mail-rendering/tsconfig.json new file mode 100644 index 00000000..a96c7ed0 --- /dev/null +++ b/packages/mail-rendering/tsconfig.json @@ -0,0 +1,16 @@ +{ + "extends": "../../tsconfig.core.json", + "compilerOptions": { + "target": "ES2015", + "module": "ESNext", + "moduleResolution": "Node", + "noImplicitAny": true, + "jsx": "react-jsx", + "noEmitOnError": true, + "strict": true, + "declarationMap": true, + "outDir": "lib/" + }, + "include": ["src/**/*"], + "exclude": [] +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c7de5abf..6e81ae50 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,7 +4,7 @@ settings: autoInstallPeers: false excludeLinksFromLockfile: false -packageExtensionsChecksum: 8b8792973f669aa2277355fb90c68ff0 +packageExtensionsChecksum: 1765bd3cc36f4272c47f92ca9277c87a importers: @@ -483,6 +483,9 @@ importers: demo/campaign: dependencies: + '@comet/brevo-mail-rendering': + specifier: workspace:* + version: link:../../packages/mail-rendering '@comet/cms-site': specifier: ^7.7.0 version: 7.7.0(@types/react@18.3.12)(next@14.2.18)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) @@ -1049,6 +1052,36 @@ importers: specifier: ^8.3.2 version: 8.3.2 + packages/mail-rendering: + devDependencies: + '@comet/eslint-config': + specifier: ^7.7.0 + version: 7.7.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5) + '@types/react': + specifier: ^18.3.12 + version: 18.3.12 + '@types/react-dom': + specifier: ^18.3.1 + version: 18.3.1 + eslint: + specifier: ^8.0.0 + version: 8.56.0 + npm-run-all2: + specifier: ^5.0.2 + version: 5.0.2 + react: + specifier: ^18.3.1 + version: 18.3.1 + react-dom: + specifier: ^18.3.1 + version: 18.3.1(react@18.3.1) + rimraf: + specifier: ^6.0.1 + version: 6.0.1 + typescript: + specifier: ^4.9.5 + version: 4.9.5 + packages: /@aashutoshrathi/word-wrap@1.2.6: @@ -3973,6 +4006,7 @@ packages: '@mui/material': 5.16.7(@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/x-data-grid': 5.17.26(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) + '@types/react': 17.0.75 clsx: 1.2.1 exceljs: 3.10.0 file-saver: 2.0.5 @@ -5674,8 +5708,9 @@ packages: /@humanwhocodes/config-array@0.11.14: resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==} engines: {node: '>=10.10.0'} + deprecated: Use @eslint/config-array instead dependencies: - '@humanwhocodes/object-schema': 2.0.2 + '@humanwhocodes/object-schema': 2.0.3 debug: 4.3.7(supports-color@9.4.0) minimatch: 3.1.2 transitivePeerDependencies: @@ -5690,8 +5725,9 @@ packages: engines: {node: '>=10.10.0'} dev: true - /@humanwhocodes/object-schema@2.0.2: - resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==} + /@humanwhocodes/object-schema@2.0.3: + resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==} + deprecated: Use @eslint/object-schema instead /@isaacs/cliui@8.0.2: resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} @@ -6545,7 +6581,7 @@ packages: '@mui/utils': 5.16.6(@types/react@17.0.75)(react@17.0.2) '@popperjs/core': 2.11.8 '@types/react': 17.0.75 - '@types/react-transition-group': 4.4.10 + '@types/react-transition-group': 4.4.10(@types/react@17.0.75) clsx: 2.1.0 csstype: 3.1.3 prop-types: 15.8.1 @@ -6657,7 +6693,7 @@ packages: optional: true dependencies: '@babel/runtime': 7.24.5 - '@types/prop-types': 15.7.11 + '@types/prop-types': 15.7.13 '@types/react': 17.0.75 prop-types: 15.8.1 react: 17.0.2 @@ -7154,7 +7190,7 @@ packages: resolution: {integrity: sha512-+9BcqfiEDGPXEIo+o3tso/aqGM5dGbGwAkGVp3FPpZ8GlkK1YlaKRd9gMVyPaeRATwvO5wYGGnCsAc/sMMM9Qw==} engines: {node: '>=14'} dependencies: - '@opentelemetry/api': 1.7.0 + '@opentelemetry/api': 1.9.0 dev: false /@opentelemetry/api@1.7.0: @@ -9020,12 +9056,23 @@ packages: resolution: {integrity: sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==} dev: true - /@types/hoist-non-react-statics@3.3.5: + /@types/hoist-non-react-statics@3.3.5(@types/react@17.0.75): resolution: {integrity: sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==} + peerDependencies: + '@types/react': '*' dependencies: '@types/react': 17.0.75 hoist-non-react-statics: 3.3.2 + /@types/hoist-non-react-statics@3.3.5(@types/react@18.3.12): + resolution: {integrity: sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==} + peerDependencies: + '@types/react': '*' + dependencies: + '@types/react': 18.3.12 + hoist-non-react-statics: 3.3.2 + dev: false + /@types/html-minifier-terser@6.1.0: resolution: {integrity: sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==} dev: true @@ -9277,7 +9324,7 @@ packages: /@types/react-dom@18.3.1: resolution: {integrity: sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==} dependencies: - '@types/react': 17.0.75 + '@types/react': 18.3.12 dev: true /@types/react-router-dom@5.3.3: @@ -9295,8 +9342,10 @@ packages: '@types/react': 17.0.75 dev: true - /@types/react-transition-group@4.4.10: + /@types/react-transition-group@4.4.10(@types/react@17.0.75): resolution: {integrity: sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==} + peerDependencies: + '@types/react': ^17.0.0 dependencies: '@types/react': 17.0.75 @@ -9310,7 +9359,7 @@ packages: /@types/react@18.3.12: resolution: {integrity: sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==} dependencies: - '@types/prop-types': 15.7.11 + '@types/prop-types': 15.7.13 csstype: 3.1.3 /@types/request@2.48.12: @@ -9383,7 +9432,7 @@ packages: /@types/styled-components@5.1.34: resolution: {integrity: sha512-mmiVvwpYklFIv9E8qfxuPyIt/OuyIrn6gMOAMOFUO3WJfSrSE+sGUoa4PiZj77Ut7bKZpaa6o1fBKS/4TOEvnA==} dependencies: - '@types/hoist-non-react-statics': 3.3.5 + '@types/hoist-non-react-statics': 3.3.5(@types/react@17.0.75) '@types/react': 17.0.75 csstype: 3.1.3 dev: true @@ -11757,6 +11806,7 @@ packages: path-key: 3.1.1 shebang-command: 2.0.0 which: 2.0.2 + dev: true /cross-spawn@7.0.6: resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} @@ -12949,6 +12999,7 @@ packages: /eslint@8.56.0: resolution: {integrity: sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options. hasBin: true dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) @@ -12961,8 +13012,8 @@ packages: '@ungap/structured-clone': 1.2.0 ajv: 6.12.6 chalk: 4.1.2 - cross-spawn: 7.0.3 - debug: 4.3.4 + cross-spawn: 7.0.6 + debug: 4.3.7(supports-color@9.4.0) doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.2.2 @@ -13585,7 +13636,7 @@ packages: resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==} engines: {node: ^10.12.0 || >=12.0.0} dependencies: - flatted: 3.2.9 + flatted: 3.3.2 keyv: 4.5.4 rimraf: 3.0.2 @@ -13593,8 +13644,8 @@ packages: resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==} hasBin: true - /flatted@3.2.9: - resolution: {integrity: sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==} + /flatted@3.3.2: + resolution: {integrity: sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==} /follow-redirects@1.15.9: resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==} @@ -13927,8 +13978,8 @@ packages: dependencies: foreground-child: 3.1.1 jackspeak: 2.3.6 - minimatch: 9.0.3 - minipass: 7.0.4 + minimatch: 9.0.5 + minipass: 7.1.2 path-scurry: 1.11.1 dev: true @@ -13939,11 +13990,24 @@ packages: dependencies: foreground-child: 3.1.1 jackspeak: 2.3.6 - minimatch: 9.0.3 - minipass: 7.0.4 + minimatch: 9.0.5 + minipass: 7.1.2 path-scurry: 1.11.1 dev: false + /glob@11.0.0: + resolution: {integrity: sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==} + engines: {node: 20 || >=22} + hasBin: true + dependencies: + foreground-child: 3.1.1 + jackspeak: 4.0.2 + minimatch: 10.0.1 + minipass: 7.1.2 + package-json-from-dist: 1.0.1 + path-scurry: 2.0.0 + dev: true + /glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} deprecated: Glob versions prior to v9 are no longer supported @@ -15177,6 +15241,13 @@ packages: optionalDependencies: '@pkgjs/parseargs': 0.11.0 + /jackspeak@4.0.2: + resolution: {integrity: sha512-bZsjR/iRjl1Nk1UkjGpAzLNfQtzuijhn2g+pbZb98HQ1Gk8vM9hfbxeMBP+M2/UUdwj0RqGG3mlvk2MsAqwvEw==} + engines: {node: 20 || >=22} + dependencies: + '@isaacs/cliui': 8.0.2 + dev: true + /jest-changed-files@27.5.1: resolution: {integrity: sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -16769,6 +16840,11 @@ packages: resolution: {integrity: sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==} engines: {node: 14 || >=16.14} + /lru-cache@11.0.2: + resolution: {integrity: sha512-123qHRfJBmo2jXDbo/a5YOQrJoHF/GNQTLzQ5+IdK5pWpceK17yRc6ozlWd25FxvGKQbIUs91fDFkXmDHTKcyA==} + engines: {node: 20 || >=22} + dev: true + /lru-cache@4.0.2: resolution: {integrity: sha512-uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==} dependencies: @@ -17017,6 +17093,13 @@ packages: /minimalistic-assert@1.0.1: resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==} + /minimatch@10.0.1: + resolution: {integrity: sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==} + engines: {node: 20 || >=22} + dependencies: + brace-expansion: 2.0.1 + dev: true + /minimatch@3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} dependencies: @@ -17054,6 +17137,13 @@ packages: engines: {node: '>=16 || 14 >=14.17'} dependencies: brace-expansion: 2.0.1 + dev: true + + /minimatch@9.0.5: + resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + brace-expansion: 2.0.1 /minimist-options@4.1.0: resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==} @@ -17082,8 +17172,8 @@ packages: resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} engines: {node: '>=8'} - /minipass@7.0.4: - resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==} + /minipass@7.1.2: + resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==} engines: {node: '>=16 || 14 >=14.17'} /minizlib@2.1.2: @@ -17147,7 +17237,7 @@ packages: html-minifier: 4.0.0 js-beautify: 1.15.1 lodash: 4.17.21 - minimatch: 9.0.3 + minimatch: 9.0.5 mjml-core: 4.15.3 mjml-migrate: 4.15.3 mjml-parser-xml: 4.15.3 @@ -18097,6 +18187,10 @@ packages: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} + /package-json-from-dist@1.0.1: + resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==} + dev: true + /package-manager-detector@0.2.2: resolution: {integrity: sha512-VgXbyrSNsml4eHWIvxxG/nTL4wgybMTXCV2Un/+yEc3aDKKU6nQBZjbeP3Pl3qm9Qg92X/1ng4ffvCeD/zwHgg==} dev: true @@ -18276,7 +18370,15 @@ packages: engines: {node: '>=16 || 14 >=14.18'} dependencies: lru-cache: 10.2.2 - minipass: 7.0.4 + minipass: 7.1.2 + + /path-scurry@2.0.0: + resolution: {integrity: sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==} + engines: {node: 20 || >=22} + dependencies: + lru-cache: 11.0.2 + minipass: 7.1.2 + dev: true /path-to-regexp@0.1.10: resolution: {integrity: sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==} @@ -18952,7 +19054,7 @@ packages: '@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/hoist-non-react-statics': 3.3.5(@types/react@17.0.75) '@types/react': 17.0.75 hoist-non-react-statics: 3.3.2 intl-messageformat: 9.13.0 @@ -18975,7 +19077,7 @@ packages: '@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/hoist-non-react-statics': 3.3.5(@types/react@18.3.12) '@types/react': 18.3.12 hoist-non-react-statics: 3.3.2 intl-messageformat: 9.13.0 @@ -19512,6 +19614,15 @@ packages: glob: 9.3.5 dev: true + /rimraf@6.0.1: + resolution: {integrity: sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==} + engines: {node: 20 || >=22} + hasBin: true + dependencies: + glob: 11.0.0 + package-json-from-dist: 1.0.1 + dev: true + /run-applescript@5.0.0: resolution: {integrity: sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==} engines: {node: '>=12'} From 11b8388052c9c0c6fa9ba938dccd90658aadef84 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 31 Dec 2024 10:35:46 +0100 Subject: [PATCH 112/121] Update dependency @changesets/cli to ^2.27.11 (#257) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index d81f3ada..c3bb573f 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ }, "devDependencies": { "@comet/dev-process-manager": "^2.7.0", - "@changesets/cli": "^2.27.10", + "@changesets/cli": "^2.27.11", "@formatjs/cli": "^4.8.4", "@types/node": "^18.0.0", "dotenv-cli": "^6.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c7de5abf..56aa05e6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,8 +11,8 @@ importers: .: devDependencies: '@changesets/cli': - specifier: ^2.27.10 - version: 2.27.10 + specifier: ^2.27.11 + version: 2.27.11 '@comet/dev-process-manager': specifier: ^2.7.0 version: 2.7.0 @@ -3629,10 +3629,10 @@ packages: requireindex: 1.1.0 dev: true - /@changesets/apply-release-plan@7.0.6: - resolution: {integrity: sha512-TKhVLtiwtQOgMAC0fCJfmv93faiViKSDqr8oMEqrnNs99gtSC1sZh/aEMS9a+dseU1ESZRCK+ofLgGY7o0fw/Q==} + /@changesets/apply-release-plan@7.0.7: + resolution: {integrity: sha512-qnPOcmmmnD0MfMg9DjU1/onORFyRpDXkMMl2IJg9mECY6RnxL3wN0TCCc92b2sXt1jt8DgjAUUsZYGUGTdYIXA==} dependencies: - '@changesets/config': 3.0.4 + '@changesets/config': 3.0.5 '@changesets/get-version-range-type': 0.4.0 '@changesets/git': 3.0.2 '@changesets/should-skip-package': 0.1.1 @@ -3664,17 +3664,17 @@ packages: '@changesets/types': 6.0.0 dev: true - /@changesets/cli@2.27.10: - resolution: {integrity: sha512-PfeXjvs9OfQJV8QSFFHjwHX3QnUL9elPEQ47SgkiwzLgtKGyuikWjrdM+lO9MXzOE22FO9jEGkcs4b+B6D6X0Q==} + /@changesets/cli@2.27.11: + resolution: {integrity: sha512-1QislpE+nvJgSZZo9+Lj3Lno5pKBgN46dAV8IVxKJy9wX8AOrs9nn5pYVZuDpoxWJJCALmbfOsHkyxujgetQSg==} hasBin: true dependencies: - '@changesets/apply-release-plan': 7.0.6 + '@changesets/apply-release-plan': 7.0.7 '@changesets/assemble-release-plan': 6.0.5 '@changesets/changelog-git': 0.2.0 - '@changesets/config': 3.0.4 + '@changesets/config': 3.0.5 '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.1.2 - '@changesets/get-release-plan': 4.0.5 + '@changesets/get-release-plan': 4.0.6 '@changesets/git': 3.0.2 '@changesets/logger': 0.1.1 '@changesets/pre': 2.0.1 @@ -3698,8 +3698,8 @@ packages: term-size: 2.2.1 dev: true - /@changesets/config@3.0.4: - resolution: {integrity: sha512-+DiIwtEBpvvv1z30f8bbOsUQGuccnZl9KRKMM/LxUHuDu5oEjmN+bJQ1RIBKNJjfYMQn8RZzoPiX0UgPaLQyXw==} + /@changesets/config@3.0.5: + resolution: {integrity: sha512-QyXLSSd10GquX7hY0Mt4yQFMEeqnO5z/XLpbIr4PAkNNoQNKwDyiSrx4yd749WddusH1v3OSiA0NRAYmH/APpQ==} dependencies: '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.1.2 @@ -3725,11 +3725,11 @@ packages: semver: 7.5.4 dev: true - /@changesets/get-release-plan@4.0.5: - resolution: {integrity: sha512-E6wW7JoSMcctdVakut0UB76FrrN3KIeJSXvB+DHMFo99CnC3ZVnNYDCVNClMlqAhYGmLmAj77QfApaI3ca4Fkw==} + /@changesets/get-release-plan@4.0.6: + resolution: {integrity: sha512-FHRwBkY7Eili04Y5YMOZb0ezQzKikTka4wL753vfUA5COSebt7KThqiuCN9BewE4/qFGgF/5t3AuzXx1/UAY4w==} dependencies: '@changesets/assemble-release-plan': 6.0.5 - '@changesets/config': 3.0.4 + '@changesets/config': 3.0.5 '@changesets/pre': 2.0.1 '@changesets/read': 0.6.2 '@changesets/types': 6.0.0 From ebecbc932995db6cb1e70666a6f5a6c11cc620ef Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 09:45:42 +0100 Subject: [PATCH 113/121] Update dependency @fontsource-variable/roboto-flex to ^5.1.1 (#258) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 648d0aa5..287930d8 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -34,7 +34,7 @@ "@comet/cms-admin": "^7.7.0", "@emotion/react": "^11.9.3", "@emotion/styled": "^11.9.3", - "@fontsource-variable/roboto-flex": "^5.1.0", + "@fontsource-variable/roboto-flex": "^5.1.1", "@mui/icons-material": "^5.16.8", "@mui/lab": "^5.0.0-alpha.173", "@mui/material": "^5.16.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 56aa05e6..d931b439 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -83,8 +83,8 @@ importers: specifier: ^11.9.3 version: 11.11.0(@emotion/react@11.11.3)(@types/react@17.0.75)(react@17.0.2) '@fontsource-variable/roboto-flex': - specifier: ^5.1.0 - version: 5.1.0 + specifier: ^5.1.1 + version: 5.1.1 '@mui/icons-material': specifier: ^5.16.8 version: 5.16.8(@mui/material@5.16.7)(@types/react@17.0.75)(react@17.0.2) @@ -4630,8 +4630,8 @@ packages: /@floating-ui/utils@0.2.1: resolution: {integrity: sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==} - /@fontsource-variable/roboto-flex@5.1.0: - resolution: {integrity: sha512-TwH8+uOwBqIjxtvTc+kp7ywyH7V7bDLbAXrEQg2SoCTJ6m2pn00x7ULioTTzDEvek+XpbqIf8gbKE1zlcONNGg==} + /@fontsource-variable/roboto-flex@5.1.1: + resolution: {integrity: sha512-cMtqtR+EhqTcox5+Sz+/+N7C8hHheQm1EtxJ9qrr356N2lwbpEU0y5OA4as+V7cdiaEFxXw6jzO9KoqLMZ6tNg==} dev: false /@formatjs/cli@3.2.0: From cc4bd07037b406b0f527709b8d12e7c05df05b3c Mon Sep 17 00:00:00 2001 From: juliawegmayr <109900447+juliawegmayr@users.noreply.github.com> Date: Thu, 9 Jan 2025 08:40:53 +0100 Subject: [PATCH 114/121] Add allowedRediretionURL field to brevo config (#114) --- .changeset/twelve-games-run.md | 17 + demo/api/schema.gql | 3 + demo/api/src/app.module.ts | 2 - demo/api/src/config/config.ts | 1 - demo/api/src/config/environment-variables.ts | 3 - .../brevoConfiguration/BrevoConfigForm.gql.ts | 1 + .../brevoConfiguration/BrevoConfigForm.tsx | 49 +- packages/api/schema.gql | 557 ++++++++---------- .../brevo-config/dto/brevo-config.input.ts | 7 +- .../entities/brevo-config-entity.factory.ts | 5 + .../brevo-contact-import.console.ts | 6 +- .../validator/redirect-url.validator.ts | 12 +- .../api/src/config/brevo-module.config.ts | 1 - .../migrations/Migration20241022144400.ts | 7 + .../src/mikro-orm/migrations/migrations.ts | 2 + 15 files changed, 354 insertions(+), 319 deletions(-) create mode 100644 .changeset/twelve-games-run.md create mode 100644 packages/api/src/mikro-orm/migrations/Migration20241022144400.ts diff --git a/.changeset/twelve-games-run.md b/.changeset/twelve-games-run.md new file mode 100644 index 00000000..846d2bbb --- /dev/null +++ b/.changeset/twelve-games-run.md @@ -0,0 +1,17 @@ +--- +"@comet/brevo-api": major +"@comet/brevo-admin": minor +--- + +Add a brevo configuration field for `allowedRedirectionUrl` +Env vars containing this information can be removed and must be removed from the brevo module configuration. + +```diff +BrevoModule.register({ + brevo: { +- allowedRedirectionUrl: config.brevo.allowedRedirectionUrl, + //... + }, + //.. +}) +``` diff --git a/demo/api/schema.gql b/demo/api/schema.gql index e2ae8814..81908efb 100644 --- a/demo/api/schema.gql +++ b/demo/api/schema.gql @@ -507,6 +507,7 @@ type BrevoConfig implements DocumentInterface { senderName: String! doubleOptInTemplateId: Int! folderId: Int! + allowedRedirectionUrl: String! createdAt: DateTime! scope: EmailCampaignContentScope! } @@ -1034,6 +1035,7 @@ input BrevoConfigInput { senderName: String! doubleOptInTemplateId: Int! folderId: Int! + allowedRedirectionUrl: String! } input BrevoConfigUpdateInput { @@ -1041,4 +1043,5 @@ input BrevoConfigUpdateInput { senderName: String doubleOptInTemplateId: Int folderId: Int + allowedRedirectionUrl: String } diff --git a/demo/api/src/app.module.ts b/demo/api/src/app.module.ts index 91d86107..adbef47e 100644 --- a/demo/api/src/app.module.ts +++ b/demo/api/src/app.module.ts @@ -148,13 +148,11 @@ export class AppModule { if (scope.domain === "main") { return { apiKey: config.brevo.apiKey, - allowedRedirectUrl: config.brevo.allowedRedirectUrl, redirectUrlForImport: config.brevo.redirectUrlForImport, }; } else { return { apiKey: config.brevo.apiKey, - allowedRedirectUrl: config.brevo.allowedRedirectUrl, redirectUrlForImport: config.brevo.redirectUrlForImport, }; } diff --git a/demo/api/src/config/config.ts b/demo/api/src/config/config.ts index 3de2d653..264b4093 100644 --- a/demo/api/src/config/config.ts +++ b/demo/api/src/config/config.ts @@ -57,7 +57,6 @@ export function createConfig(processEnv: NodeJS.ProcessEnv) { }, brevo: { apiKey: envVars.BREVO_API_KEY, - allowedRedirectUrl: envVars.BREVO_ALLOWED_REDIRECT_URL, redirectUrlForImport: envVars.REDIRECT_URL_FOR_IMPORT, }, campaign: { diff --git a/demo/api/src/config/environment-variables.ts b/demo/api/src/config/environment-variables.ts index 96182425..46e55232 100644 --- a/demo/api/src/config/environment-variables.ts +++ b/demo/api/src/config/environment-variables.ts @@ -115,9 +115,6 @@ export class EnvironmentVariables { @IsString() BREVO_API_KEY: string; - @IsString() - BREVO_ALLOWED_REDIRECT_URL: string; - @IsString() REDIRECT_URL_FOR_IMPORT: string; diff --git a/packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts b/packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts index 81e7523c..80b28b0e 100644 --- a/packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts +++ b/packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts @@ -6,6 +6,7 @@ export const brevoConfigFormFragment = gql` senderName doubleOptInTemplateId folderId + allowedRedirectionUrl } `; diff --git a/packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx b/packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx index a719cacb..6804e50f 100644 --- a/packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx +++ b/packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx @@ -8,6 +8,7 @@ import { Loading, MainContent, NumberField, + TextField, Toolbar, ToolbarActions, ToolbarFillSpace, @@ -50,12 +51,23 @@ type FormValues = { sender: Option; doubleOptInTemplate: Option; folderId: number; + allowedRedirectionUrl: string; }; interface FormProps { scope: ContentScopeInterface; } +function validateUrl(value: string): React.ReactNode | undefined { + const urlPattern = /^(https?:\/\/)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}(:\d{1,5})?(\/[^\s]*)?$/; + if (!urlPattern.test(value)) { + return ( + + ); + } + return undefined; +} + export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { const client = useApolloClient(); const formApiRef = useFormApiRef(); @@ -114,10 +126,13 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { label: `${doubleOptInTemplate?.id}: ${doubleOptInTemplate?.name}`, } : undefined, + allowedRedirectionUrl: data?.brevoConfig?.allowedRedirectionUrl ?? "", folderId: data?.brevoConfig?.folderId ?? 1, }; }, [ data?.brevoConfig?.folderId, + data?.brevoConfig?.allowedRedirectionUrl, + data?.brevoConfig?.doubleOptInTemplateId, data?.brevoConfig?.senderMail, data?.brevoConfig?.senderName, @@ -155,7 +170,7 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { const sender = sendersData?.senders?.find((s) => s.email === state.sender.value); - if (!sender || !state.doubleOptInTemplate) { + if (!sender || !state.doubleOptInTemplate || !state.allowedRedirectionUrl) { throw new Error("Not all required fields are set"); } @@ -164,6 +179,7 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { senderMail: sender?.email, doubleOptInTemplateId: Number(state.doubleOptInTemplate.value), folderId: state.folderId ?? 1, + allowedRedirectionUrl: state?.allowedRedirectionUrl ?? "", }; if (mode === "edit") { @@ -177,7 +193,10 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { } else { const { data: mutationResponse } = await client.mutate({ mutation: createBrevoConfigMutation, - variables: { scope, input: output }, + variables: { + scope, + input: output, + }, }); if (!event.navigatingBack) { const id = mutationResponse?.createBrevoConfig.id; @@ -222,7 +241,6 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { fullWidth required /> - option.label} @@ -260,6 +278,31 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { fullWidth required /> + + + + } + sx={{ marginLeft: "5px" }} + > + + + + } + validate={validateUrl} + /> ); diff --git a/packages/api/schema.gql b/packages/api/schema.gql index 18493b03..d4e98867 100644 --- a/packages/api/schema.gql +++ b/packages/api/schema.gql @@ -1,12 +1,12 @@ type User { - id: String! - name: String! - email: String! + id: String! + name: String! + email: String! } type CurrentUserPermission { - permission: String! - contentScopes: [JSONObject!]! + permission: String! + contentScopes: [JSONObject!]! } """ @@ -15,175 +15,153 @@ The `JSONObject` scalar type represents JSON objects as specified by [ECMA-404]( scalar JSONObject @specifiedBy(url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf") type Dependency { - rootId: String! - rootGraphqlObjectType: String! - rootColumnName: String! - jsonPath: String! - visible: Boolean! - targetGraphqlObjectType: String! - targetId: String! - name: String - secondaryInformation: String + rootId: String! + rootGraphqlObjectType: String! + rootColumnName: String! + jsonPath: String! + visible: Boolean! + targetGraphqlObjectType: String! + targetId: String! + name: String + secondaryInformation: String } type ImageCropArea { - focalPoint: FocalPoint! - width: Float - height: Float - x: Float - y: Float + focalPoint: FocalPoint! + width: Float + height: Float + x: Float + y: Float } enum FocalPoint { - SMART - CENTER - NORTHWEST - NORTHEAST - SOUTHWEST - SOUTHEAST + SMART + CENTER + NORTHWEST + NORTHEAST + SOUTHWEST + SOUTHEAST } type BrevoApiEmailTemplateSender { - id: String - subject: String - email: String! + id: String + subject: String + email: String! } type BrevoApiEmailTemplate { - id: ID! - name: String! - subject: String! - isActive: Boolean! - testSent: Boolean! - replyTo: String! - toField: String! - tag: String! - htmlContent: String! - createdAt: String! - modifiedAt: String! - sender: BrevoApiEmailTemplateSender! + id: ID! + name: String! + subject: String! + isActive: Boolean! + testSent: Boolean! + replyTo: String! + toField: String! + tag: String! + htmlContent: String! + createdAt: String! + modifiedAt: String! + sender: BrevoApiEmailTemplateSender! } type BrevoApiSender { - id: ID! - name: String! - email: String! - active: Boolean! - ips: [BrevoIp!] + id: ID! + name: String! + email: String! + active: Boolean! + ips: [BrevoIp!] } type BrevoIp { - ip: String! - domain: String! - weight: Int! + ip: String! + domain: String! + weight: Int! } type CsvImportInformation { - created: Int! - updated: Int! - failed: Int! - failedColumns: [[String!]!] - errorMessage: String + created: Int! + updated: Int! + failed: Int! + failedColumns: [[String!]!] + errorMessage: String } type BrevoApiCampaignStatistics { - """ - Number of unique clicks for the campaign - """ - uniqueClicks: Int! - - """ - Number of total clicks for the campaign - """ - clickers: Int! - - """ - Number of complaints (Spam reports) for the campaign - """ - complaints: Int! - - """ - Number of delivered emails for the campaign - """ - delivered: Int! - - """ - Number of sent emails for the campaign - """ - sent: Int! - - """ - Number of softbounce for the campaign - """ - softBounces: Int! - - """ - Number of hardbounces for the campaign - """ - hardBounces: Int! - - """ - Number of unique openings for the campaign - """ - uniqueViews: Int! - - """ - Number of unique openings for the campaign - """ - trackableViews: Int! - - """ - Rate of recipients without any privacy protection option enabled in their email client, applied to all delivered emails - """ - estimatedViews: Int! - - """ - Number of unsubscription for the campaign - """ - unsubscriptions: Int! - - """ - Number of openings for the campaign - """ - viewed: Int! + """Number of unique clicks for the campaign""" + uniqueClicks: Int! + + """Number of total clicks for the campaign""" + clickers: Int! + + """Number of complaints (Spam reports) for the campaign""" + complaints: Int! + + """Number of delivered emails for the campaign""" + delivered: Int! + + """Number of sent emails for the campaign""" + sent: Int! + + """Number of softbounce for the campaign""" + softBounces: Int! + + """Number of hardbounces for the campaign""" + hardBounces: Int! + + """Number of unique openings for the campaign""" + uniqueViews: Int! + + """Number of unique openings for the campaign""" + trackableViews: Int! + + """ + Rate of recipients without any privacy protection option enabled in their email client, applied to all delivered emails + """ + estimatedViews: Int! + + """Number of unsubscription for the campaign""" + unsubscriptions: Int! + + """Number of openings for the campaign""" + viewed: Int! } type EmailCampaignContentScope { - thisScopeHasNoFields____: String + thisScopeHasNoFields____: String } type BrevoContact { - id: Int! - createdAt: String! - modifiedAt: String! - email: String! - emailBlacklisted: Boolean! - smsBlacklisted: Boolean! - listIds: [Int!]! - listUnsubscribed: [Int!]! + id: Int! + createdAt: String! + modifiedAt: String! + email: String! + emailBlacklisted: Boolean! + smsBlacklisted: Boolean! + listIds: [Int!]! + listUnsubscribed: [Int!]! } type PaginatedBrevoContacts { - nodes: [BrevoContact!]! - totalCount: Int! + nodes: [BrevoContact!]! + totalCount: Int! } type TargetGroup implements DocumentInterface { - id: ID! - updatedAt: DateTime! - createdAt: DateTime! - title: String! - isMainList: Boolean! - isTestList: Boolean - brevoId: Int! - totalSubscribers: Int! - scope: EmailCampaignContentScope! - assignedContactsTargetGroupBrevoId: Int + id: ID! + updatedAt: DateTime! + createdAt: DateTime! + title: String! + isMainList: Boolean! + isTestList: Boolean! + brevoId: Int! + totalSubscribers: Int! + scope: EmailCampaignContentScope! + assignedContactsTargetGroupBrevoId: Int } interface DocumentInterface { - id: ID! - updatedAt: DateTime! + id: ID! + updatedAt: DateTime! } """ @@ -192,270 +170,243 @@ A date-time string at UTC, such as 2019-12-03T09:54:33Z, compliant with the date scalar DateTime type PaginatedTargetGroups { - nodes: [TargetGroup!]! - totalCount: Int! + nodes: [TargetGroup!]! + totalCount: Int! } type EmailCampaign implements DocumentInterface { - id: ID! - updatedAt: DateTime! - createdAt: DateTime! - title: String! - subject: String! - brevoId: Int - scheduledAt: DateTime - targetGroups: [TargetGroup!]! - content: EmailCampaignContentBlockData! - scope: EmailCampaignContentScope! - sendingState: SendingState! -} - -""" -EmailCampaignContent root block data -""" + id: ID! + updatedAt: DateTime! + createdAt: DateTime! + title: String! + subject: String! + brevoId: Int + scheduledAt: DateTime + targetGroups: [TargetGroup!]! + content: EmailCampaignContentBlockData! + scope: EmailCampaignContentScope! + sendingState: SendingState! +} + +"""EmailCampaignContent root block data""" scalar EmailCampaignContentBlockData @specifiedBy(url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf") enum SendingState { - DRAFT - SENT - SCHEDULED + DRAFT + SENT + SCHEDULED } type PaginatedEmailCampaigns { - nodes: [EmailCampaign!]! - totalCount: Int! + nodes: [EmailCampaign!]! + totalCount: Int! } type BrevoConfig implements DocumentInterface { - id: ID! - updatedAt: DateTime! - senderMail: String! - senderName: String! - doubleOptInTemplateId: Int! - folderId: Int! - createdAt: DateTime! - scope: EmailCampaignContentScope! + id: ID! + updatedAt: DateTime! + senderMail: String! + senderName: String! + doubleOptInTemplateId: Int! + folderId: Int! + allowedRedirectionUrl: String! + createdAt: DateTime! + scope: EmailCampaignContentScope! } input EmailCampaignContentScopeInput { - thisScopeHasNoFields____: String + thisScopeHasNoFields____: String } type Query { - brevoContact(id: Int!, scope: EmailCampaignContentScopeInput!): BrevoContact! - brevoContacts( - targetGroupId: ID - email: String - scope: EmailCampaignContentScopeInput! - offset: Int! = 0 - limit: Int! = 25 - ): PaginatedBrevoContacts! - brevoTestContacts( - 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! - targetGroup(id: ID!): TargetGroup! - targetGroups( - scope: EmailCampaignContentScopeInput! - search: String - filter: TargetGroupFilter - sort: [TargetGroupSort!] - offset: Int! = 0 - limit: Int! = 25 - ): PaginatedTargetGroups! - emailCampaign(id: ID!): EmailCampaign! - emailCampaigns( - scope: EmailCampaignContentScopeInput! - search: String - filter: EmailCampaignFilter - sort: [EmailCampaignSort!] - offset: Int! = 0 - limit: Int! = 25 - ): PaginatedEmailCampaigns! - emailCampaignStatistics(id: ID!): BrevoApiCampaignStatistics - senders(scope: EmailCampaignContentScopeInput!): [BrevoApiSender!] - doubleOptInTemplates: [BrevoApiEmailTemplate!] - brevoConfig(scope: EmailCampaignContentScopeInput!): BrevoConfig + brevoContact(id: Int!, scope: EmailCampaignContentScopeInput!): BrevoContact! + brevoContacts(targetGroupId: ID, email: String, scope: EmailCampaignContentScopeInput!, offset: Int! = 0, limit: Int! = 25): PaginatedBrevoContacts! + brevoTestContacts(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! + targetGroup(id: ID!): TargetGroup! + targetGroups(scope: EmailCampaignContentScopeInput!, search: String, filter: TargetGroupFilter, sort: [TargetGroupSort!], offset: Int! = 0, limit: Int! = 25): PaginatedTargetGroups! + emailCampaign(id: ID!): EmailCampaign! + emailCampaigns(scope: EmailCampaignContentScopeInput!, search: String, filter: EmailCampaignFilter, sort: [EmailCampaignSort!], offset: Int! = 0, limit: Int! = 25): PaginatedEmailCampaigns! + emailCampaignStatistics(id: ID!): BrevoApiCampaignStatistics + senders(scope: EmailCampaignContentScopeInput!): [BrevoApiSender!] + doubleOptInTemplates: [BrevoApiEmailTemplate!] + brevoConfig(scope: EmailCampaignContentScopeInput!): BrevoConfig } input TargetGroupFilter { - createdAt: DateTimeFilter - updatedAt: DateTimeFilter - title: StringFilter - isTestList: BooleanFilter - and: [TargetGroupFilter!] - or: [TargetGroupFilter!] + createdAt: DateTimeFilter + updatedAt: DateTimeFilter + title: StringFilter + isTestList: BooleanFilter + and: [TargetGroupFilter!] + or: [TargetGroupFilter!] } input DateTimeFilter { - equal: DateTime - lowerThan: DateTime - greaterThan: DateTime - lowerThanEqual: DateTime - greaterThanEqual: DateTime - notEqual: DateTime + equal: DateTime + lowerThan: DateTime + greaterThan: DateTime + lowerThanEqual: DateTime + greaterThanEqual: DateTime + notEqual: DateTime } input StringFilter { - contains: String - startsWith: String - endsWith: String - equal: String - notEqual: String + contains: String + startsWith: String + endsWith: String + equal: String + notEqual: String } input BooleanFilter { - equal: Boolean + equal: Boolean } input TargetGroupSort { - field: TargetGroupSortField! - direction: SortDirection! = ASC + field: TargetGroupSortField! + direction: SortDirection! = ASC } enum TargetGroupSortField { - createdAt - updatedAt - title + createdAt + updatedAt + title } enum SortDirection { - ASC - DESC + ASC + DESC } input EmailCampaignFilter { - createdAt: DateTimeFilter - updatedAt: DateTimeFilter - title: StringFilter - subject: StringFilter - scheduledAt: DateTimeFilter - and: [EmailCampaignFilter!] - or: [EmailCampaignFilter!] + createdAt: DateTimeFilter + updatedAt: DateTimeFilter + title: StringFilter + subject: StringFilter + scheduledAt: DateTimeFilter + and: [EmailCampaignFilter!] + or: [EmailCampaignFilter!] } input EmailCampaignSort { - field: EmailCampaignSortField! - direction: SortDirection! = ASC + field: EmailCampaignSortField! + direction: SortDirection! = ASC } enum EmailCampaignSortField { - createdAt - updatedAt - title - subject - scheduledAt + createdAt + updatedAt + title + subject + scheduledAt } type Mutation { - updateBrevoContact(id: Int!, scope: EmailCampaignContentScopeInput!, input: BrevoContactUpdateInput!): BrevoContact! - createBrevoContact(scope: EmailCampaignContentScopeInput!, input: BrevoContactInput!): SubscribeResponse! - createBrevoTestContact(scope: EmailCampaignContentScopeInput!, input: BrevoTestContactInput!): SubscribeResponse! - deleteBrevoContact(id: Int!, scope: EmailCampaignContentScopeInput!): Boolean! - deleteBrevoTestContact(id: Int!, scope: EmailCampaignContentScopeInput!): Boolean! - subscribeBrevoContact(input: SubscribeInput!, scope: EmailCampaignContentScopeInput!): SubscribeResponse! - createTargetGroup(scope: EmailCampaignContentScopeInput!, input: TargetGroupInput!): TargetGroup! - addBrevoContactsToTargetGroup(id: ID!, input: AddBrevoContactsInput!): Boolean! - removeBrevoContactFromTargetGroup(id: ID!, input: RemoveBrevoContactInput!): Boolean! - updateTargetGroup(id: ID!, input: TargetGroupUpdateInput!, lastUpdatedAt: DateTime): TargetGroup! - deleteTargetGroup(id: ID!): Boolean! - createEmailCampaign(scope: EmailCampaignContentScopeInput!, input: EmailCampaignInput!): EmailCampaign! - updateEmailCampaign(id: ID!, input: EmailCampaignUpdateInput!, lastUpdatedAt: DateTime): EmailCampaign! - deleteEmailCampaign(id: ID!): Boolean! - sendEmailCampaignNow(id: ID!): Boolean! - sendEmailCampaignToTestEmails(id: ID!, data: SendTestEmailCampaignArgs!): Boolean! - startBrevoContactImport(fileId: ID!, targetGroupIds: [ID!], scope: EmailCampaignContentScopeInput!): CsvImportInformation! - createBrevoConfig(scope: EmailCampaignContentScopeInput!, input: BrevoConfigInput!): BrevoConfig! - updateBrevoConfig(id: ID!, input: BrevoConfigUpdateInput!, lastUpdatedAt: DateTime): BrevoConfig! + updateBrevoContact(id: Int!, scope: EmailCampaignContentScopeInput!, input: BrevoContactUpdateInput!): BrevoContact! + createBrevoContact(scope: EmailCampaignContentScopeInput!, input: BrevoContactInput!): SubscribeResponse! + createBrevoTestContact(scope: EmailCampaignContentScopeInput!, input: BrevoTestContactInput!): SubscribeResponse! + deleteBrevoContact(id: Int!, scope: EmailCampaignContentScopeInput!): Boolean! + deleteBrevoTestContact(id: Int!, scope: EmailCampaignContentScopeInput!): Boolean! + subscribeBrevoContact(input: SubscribeInput!, scope: EmailCampaignContentScopeInput!): SubscribeResponse! + createTargetGroup(scope: EmailCampaignContentScopeInput!, input: TargetGroupInput!): TargetGroup! + addBrevoContactsToTargetGroup(id: ID!, input: AddBrevoContactsInput!): Boolean! + removeBrevoContactFromTargetGroup(id: ID!, input: RemoveBrevoContactInput!): Boolean! + updateTargetGroup(id: ID!, input: TargetGroupUpdateInput!, lastUpdatedAt: DateTime): TargetGroup! + deleteTargetGroup(id: ID!): Boolean! + createEmailCampaign(scope: EmailCampaignContentScopeInput!, input: EmailCampaignInput!): EmailCampaign! + updateEmailCampaign(id: ID!, input: EmailCampaignUpdateInput!, lastUpdatedAt: DateTime): EmailCampaign! + deleteEmailCampaign(id: ID!): Boolean! + sendEmailCampaignNow(id: ID!): Boolean! + sendEmailCampaignToTestEmails(id: ID!, data: SendTestEmailCampaignArgs!): Boolean! + startBrevoContactImport(fileId: ID!, targetGroupIds: [ID!], scope: EmailCampaignContentScopeInput!): CsvImportInformation! + createBrevoConfig(scope: EmailCampaignContentScopeInput!, input: BrevoConfigInput!): BrevoConfig! + updateBrevoConfig(id: ID!, input: BrevoConfigUpdateInput!, lastUpdatedAt: DateTime): BrevoConfig! } input BrevoContactUpdateInput { - blocked: Boolean! + blocked: Boolean! } enum SubscribeResponse { - SUCCESSFUL - ERROR_UNKNOWN - ERROR_CONTAINED_IN_ECG_RTR_LIST + SUCCESSFUL + ERROR_UNKNOWN + ERROR_CONTAINED_IN_ECG_RTR_LIST } input BrevoContactInput { - email: String! - blocked: Boolean! - redirectionUrl: String! + email: String! + blocked: Boolean! + redirectionUrl: String! } input BrevoTestContactInput { - email: String! - blocked: Boolean! + email: String! + blocked: Boolean! } input SubscribeInput { - email: String! - redirectionUrl: String! + email: String! + redirectionUrl: String! } input TargetGroupInput { - title: String! - filters: BrevoContactFilterAttributesInput + title: String! + filters: BrevoContactFilterAttributesInput } input BrevoContactFilterAttributesInput { - thisFilterHasNoFields____: [String!] + thisFilterHasNoFields____: [String!] } input AddBrevoContactsInput { - brevoContactIds: [Int!]! + brevoContactIds: [Int!]! } input RemoveBrevoContactInput { - brevoContactId: Int! + brevoContactId: Int! } input TargetGroupUpdateInput { - title: String - filters: BrevoContactFilterAttributesInput + title: String + filters: BrevoContactFilterAttributesInput } input EmailCampaignInput { - title: String! - subject: String! - scheduledAt: DateTime - targetGroups: [ID!]! - content: EmailCampaignContentBlockInput! + title: String! + subject: String! + scheduledAt: DateTime + targetGroups: [ID!]! + content: EmailCampaignContentBlockInput! } -""" -EmailCampaignContent root block input -""" +"""EmailCampaignContent root block input""" scalar EmailCampaignContentBlockInput @specifiedBy(url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf") input EmailCampaignUpdateInput { - title: String - subject: String - scheduledAt: DateTime - targetGroups: [ID!] - content: EmailCampaignContentBlockInput + title: String + subject: String + scheduledAt: DateTime + targetGroups: [ID!] + content: EmailCampaignContentBlockInput } input SendTestEmailCampaignArgs { - emails: [String!]! + emails: [String!]! } input BrevoConfigInput { - senderMail: String! - senderName: String! - doubleOptInTemplateId: Int! - folderId: Int! + senderMail: String! + senderName: String! + doubleOptInTemplateId: Int! + folderId: Int! + allowedRedirectionUrl: String! } input BrevoConfigUpdateInput { - senderMail: String - senderName: String - doubleOptInTemplateId: Int - folderId: Int + senderMail: String + senderName: String + doubleOptInTemplateId: Int + folderId: Int + allowedRedirectionUrl: String } diff --git a/packages/api/src/brevo-config/dto/brevo-config.input.ts b/packages/api/src/brevo-config/dto/brevo-config.input.ts index e3ed1657..955dab4f 100644 --- a/packages/api/src/brevo-config/dto/brevo-config.input.ts +++ b/packages/api/src/brevo-config/dto/brevo-config.input.ts @@ -1,6 +1,6 @@ import { PartialType } from "@comet/cms-api"; import { Field, InputType, Int } from "@nestjs/graphql"; -import { IsEmail, IsInt, IsNotEmpty, IsString } from "class-validator"; +import { IsEmail, IsInt, IsNotEmpty, IsString, IsUrl } from "class-validator"; @InputType() export class BrevoConfigInput { @@ -22,6 +22,11 @@ export class BrevoConfigInput { @Field(() => Int) @IsInt() folderId: number; + + @IsNotEmpty() + @Field() + @IsUrl({ require_tld: process.env.NODE_ENV === "production" }) + allowedRedirectionUrl: string; } @InputType() diff --git a/packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts b/packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts index 12d59036..c295388d 100644 --- a/packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts +++ b/packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts @@ -13,6 +13,7 @@ export interface BrevoConfigInterface { senderMail: string; doubleOptInTemplateId: number; folderId: number; + allowedRedirectionUrl: string; createdAt: Date; updatedAt: Date; scope: EmailCampaignScopeInterface; @@ -47,6 +48,10 @@ export class BrevoConfigEntityFactory { @Field(() => Int) folderId: number; + @Property({ columnType: "text" }) + @Field() + allowedRedirectionUrl: string; + @Property({ columnType: "timestamp with time zone", }) diff --git a/packages/api/src/brevo-contact/brevo-contact-import.console.ts b/packages/api/src/brevo-contact/brevo-contact-import.console.ts index 3b3829b5..74cab0db 100644 --- a/packages/api/src/brevo-contact/brevo-contact-import.console.ts +++ b/packages/api/src/brevo-contact/brevo-contact-import.console.ts @@ -5,6 +5,7 @@ import { isUUID, validateSync } from "class-validator"; import { InvalidOptionArgumentError } from "commander"; import * as fs from "fs"; import { Command, Console } from "nestjs-console"; +import { BrevoConfigInterface } from "src/brevo-config/entities/brevo-config-entity.factory"; import { BrevoContactImportService } from "../brevo-contact/brevo-contact-import.service"; import { BrevoModuleConfig } from "../config/brevo-module.config"; @@ -29,6 +30,7 @@ export function createBrevoContactImportConsole({ Scope }: { Scope: Type, + @InjectRepository("BrevoConfig") private readonly brevoConfigRepository: EntityRepository, ) {} @Command({ @@ -99,13 +101,13 @@ export function createBrevoContactImportConsole({ Scope }: { Scope: Type): Promise { - const configForScope = this.config.brevo.resolveConfig(scope); + const configForScope = await this.brevoConfigRepository.findOneOrFail({ scope }); if (!configForScope) { throw Error("Scope does not exist"); } - if (urlToValidate?.startsWith(configForScope.allowedRedirectUrl)) { + if (urlToValidate?.startsWith(configForScope.allowedRedirectionUrl)) { return true; } diff --git a/packages/api/src/brevo-contact/validator/redirect-url.validator.ts b/packages/api/src/brevo-contact/validator/redirect-url.validator.ts index 9acf9363..1f20cb92 100644 --- a/packages/api/src/brevo-contact/validator/redirect-url.validator.ts +++ b/packages/api/src/brevo-contact/validator/redirect-url.validator.ts @@ -1,5 +1,8 @@ +import { EntityRepository } from "@mikro-orm/core"; +import { InjectRepository } from "@mikro-orm/nestjs"; import { Inject, Injectable } from "@nestjs/common"; import { registerDecorator, ValidationArguments, ValidationOptions, ValidatorConstraint, ValidatorConstraintInterface } from "class-validator"; +import { BrevoConfigInterface } from "src/brevo-config/entities/brevo-config-entity.factory"; import { EmailCampaignScopeInterface } from "src/types"; import { BrevoModuleConfig } from "../../config/brevo-module.config"; @@ -21,17 +24,20 @@ export const IsValidRedirectURL = (scope: EmailCampaignScopeInterface, validatio @ValidatorConstraint({ name: "IsValidRedirectURL", async: true }) @Injectable() export class IsValidRedirectURLConstraint implements ValidatorConstraintInterface { - constructor(@Inject(BREVO_MODULE_CONFIG) private readonly config: BrevoModuleConfig) {} + constructor( + @Inject(BREVO_MODULE_CONFIG) private readonly config: BrevoModuleConfig, + @InjectRepository("BrevoConfig") private readonly brevoConfigRepository: EntityRepository, + ) {} async validate(urlToValidate: string, args: ValidationArguments): Promise { const [scope] = args.constraints; - const configForScope = this.config.brevo.resolveConfig(scope); + const configForScope = await this.brevoConfigRepository.findOneOrFail({ scope }); if (!configForScope) { throw Error("Scope does not exist"); } - if (urlToValidate?.startsWith(configForScope.allowedRedirectUrl)) { + if (urlToValidate?.startsWith(configForScope.allowedRedirectionUrl)) { return true; } diff --git a/packages/api/src/config/brevo-module.config.ts b/packages/api/src/config/brevo-module.config.ts index d75144f3..8b1efc10 100644 --- a/packages/api/src/config/brevo-module.config.ts +++ b/packages/api/src/config/brevo-module.config.ts @@ -10,7 +10,6 @@ export interface BrevoModuleConfig { brevo: { resolveConfig: (scope: EmailCampaignScopeInterface) => { apiKey: string; - allowedRedirectUrl: string; redirectUrlForImport: string; }; BrevoContactAttributes?: Type; diff --git a/packages/api/src/mikro-orm/migrations/Migration20241022144400.ts b/packages/api/src/mikro-orm/migrations/Migration20241022144400.ts new file mode 100644 index 00000000..47bad202 --- /dev/null +++ b/packages/api/src/mikro-orm/migrations/Migration20241022144400.ts @@ -0,0 +1,7 @@ +import { Migration } from "@mikro-orm/migrations"; + +export class Migration20241022144400 extends Migration { + async up(): Promise { + this.addSql('alter table "BrevoConfig" add column "allowedRedirectionUrl" text;'); + } +} diff --git a/packages/api/src/mikro-orm/migrations/migrations.ts b/packages/api/src/mikro-orm/migrations/migrations.ts index 0527a326..ebb9a181 100644 --- a/packages/api/src/mikro-orm/migrations/migrations.ts +++ b/packages/api/src/mikro-orm/migrations/migrations.ts @@ -11,6 +11,7 @@ import { Migration20240819214939 } from "./Migration20240819214939"; import { Migration20240830112400 } from "./Migration20240830112400"; import { Migration20241016123307 } from "./Migration20241016123307"; import { Migration20241018110515 } from "./Migration20241018110515"; +import { Migration20241022144400 } from "./Migration20241022144400"; import { Migration20241119101706 } from "./Migration20241119101706"; export const migrationsList: MigrationObject[] = [ @@ -26,4 +27,5 @@ export const migrationsList: MigrationObject[] = [ { name: "Migration20241016123307", class: Migration20241016123307 }, { name: "Migration20241018110515", class: Migration20241018110515 }, { name: "Migration20241119101706", class: Migration20241119101706 }, + { name: "Migration20241022144400", class: Migration20241022144400 }, ]; From 2f9f03be9574816c62b9ce4f9055e9d42e747ca6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 10 Jan 2025 08:02:29 +0100 Subject: [PATCH 115/121] Update dependency @mui/icons-material to ^5.16.14 (#259) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- demo/admin/package.json | 2 +- packages/admin/package.json | 4 ++-- pnpm-lock.yaml | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/demo/admin/package.json b/demo/admin/package.json index 287930d8..d96930e1 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -35,7 +35,7 @@ "@emotion/react": "^11.9.3", "@emotion/styled": "^11.9.3", "@fontsource-variable/roboto-flex": "^5.1.1", - "@mui/icons-material": "^5.16.8", + "@mui/icons-material": "^5.16.14", "@mui/lab": "^5.0.0-alpha.173", "@mui/material": "^5.16.7", "@mui/system": "^5.16.7", diff --git a/packages/admin/package.json b/packages/admin/package.json index dd5b69c8..c49e967a 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -47,7 +47,7 @@ "@emotion/react": "^11.9.3", "@emotion/styled": "^11.9.3", "@graphql-codegen/cli": "^2.16.5", - "@mui/icons-material": "^5.16.8", + "@mui/icons-material": "^5.16.14", "@mui/material": "^5.16.7", "@mui/system": "^5.16.7", "@mui/x-data-grid": "^5.17.26", @@ -82,7 +82,7 @@ "@comet/cms-admin": "^7.7.0", "@emotion/react": "^11.9.3", "@emotion/styled": "^11.9.3", - "@mui/icons-material": "^5.16.8", + "@mui/icons-material": "^5.16.14", "@mui/material": "^5.16.7", "@mui/system": "^5.16.7", "@mui/x-data-grid": "^5.17.26", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d931b439..38df5fb7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -86,8 +86,8 @@ importers: specifier: ^5.1.1 version: 5.1.1 '@mui/icons-material': - specifier: ^5.16.8 - version: 5.16.8(@mui/material@5.16.7)(@types/react@17.0.75)(react@17.0.2) + specifier: ^5.16.14 + version: 5.16.14(@mui/material@5.16.7)(@types/react@17.0.75)(react@17.0.2) '@mui/lab': specifier: ^5.0.0-alpha.173 version: 5.0.0-alpha.173(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) @@ -835,8 +835,8 @@ importers: specifier: ^2.16.5 version: 2.16.5(@babel/core@7.26.0)(@types/node@18.19.8)(graphql@15.9.0)(typescript@4.9.5) '@mui/icons-material': - specifier: ^5.16.8 - version: 5.16.8(@mui/material@5.16.7)(@types/react@17.0.75)(react@17.0.2) + specifier: ^5.16.14 + version: 5.16.14(@mui/material@5.16.7)(@types/react@17.0.75)(react@17.0.2) '@mui/material': specifier: ^5.16.7 version: 5.16.7(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) @@ -6471,8 +6471,8 @@ packages: /@mui/core-downloads-tracker@5.16.7: resolution: {integrity: sha512-RtsCt4Geed2/v74sbihWzzRs+HsIQCfclHeORh5Ynu2fS4icIKozcSubwuG7vtzq2uW3fOR1zITSP84TNt2GoQ==} - /@mui/icons-material@5.16.8(@mui/material@5.16.7)(@types/react@17.0.75)(react@17.0.2): - resolution: {integrity: sha512-2HKzTsCPbNgJq2z4tI6sLDwxKXqiiPh6L3IhuB8w+ypShE/qAI4FZQfI2o93vysQnkPB4Rw3FKSwAJWTThhHQA==} + /@mui/icons-material@5.16.14(@mui/material@5.16.7)(@types/react@17.0.75)(react@17.0.2): + resolution: {integrity: sha512-heL4S+EawrP61xMXBm59QH6HODsu0gxtZi5JtnXF2r+rghzyU/3Uftlt1ij8rmJh+cFdKTQug1L9KkZB5JgpMQ==} engines: {node: '>=12.0.0'} peerDependencies: '@mui/material': ^5.0.0 From aae093b3ee455679ab35499854addbbefa05ea82 Mon Sep 17 00:00:00 2001 From: juliawegmayr <109900447+juliawegmayr@users.noreply.github.com> Date: Wed, 15 Jan 2025 11:01:26 +0100 Subject: [PATCH 116/121] Add image block (#253) --- .github/workflows/lint.yml | 4 + copy-schema-files.js | 1 + .../blocks/EmailCampaignContentBlock.tsx | 4 +- demo/api/block-meta.json | 23 +- .../blocks/email-campaign-content.block.ts | 4 +- demo/campaign/src/blocks/ContentBlock.tsx | 4 +- dev-pm.config.js | 10 + install.sh | 3 + .../admin/src/blocks/NewsletterImageBlock.tsx | 16 + packages/admin/src/index.ts | 1 + packages/api/.gitignore | 2 +- packages/api/.prettierignore | 3 +- packages/api/block-meta.json | 827 ++++++++++++++++++ packages/api/generate-block-meta.ts | 17 + packages/api/package.json | 2 + .../api/src/blocks/newsletter-image.block.ts | 27 + packages/api/src/index.ts | 1 + packages/mail-rendering/.gitignore | 4 +- packages/mail-rendering/.prettierignore | 2 + packages/mail-rendering/package.json | 15 +- .../mail-rendering/src/blocks/ImageBlock.tsx | 3 - .../src/blocks/NewsletterImageBlock.tsx | 7 + packages/mail-rendering/src/index.ts | 2 +- pnpm-lock.yaml | 12 +- 24 files changed, 973 insertions(+), 21 deletions(-) create mode 100644 packages/admin/src/blocks/NewsletterImageBlock.tsx create mode 100644 packages/api/block-meta.json create mode 100644 packages/api/generate-block-meta.ts create mode 100644 packages/api/src/blocks/newsletter-image.block.ts create mode 100644 packages/mail-rendering/.prettierignore delete mode 100644 packages/mail-rendering/src/blocks/ImageBlock.tsx create mode 100644 packages/mail-rendering/src/blocks/NewsletterImageBlock.tsx diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4cb2fd70..568b2160 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -70,3 +70,7 @@ jobs: pnpm run lint # check for duplicate ids of formatted messages pnpm run intl:extract + # check if schema files are up to date + pnpm --filter '@comet/brevo-api' run generate-block-meta + pnpm --filter '@comet/brevo-api' run generate-schema + git diff --exit-code HEAD -- diff --git a/copy-schema-files.js b/copy-schema-files.js index 7f7674e6..ec5543d7 100644 --- a/copy-schema-files.js +++ b/copy-schema-files.js @@ -3,6 +3,7 @@ const fs = require("fs"); (async () => { await Promise.all([ fs.promises.copyFile("packages/api/schema.gql", "packages/admin/schema.gql"), + fs.promises.copyFile("packages/api/block-meta.json", "packages/mail-rendering/block-meta.json"), fs.promises.copyFile("demo/api/block-meta.json", "demo/admin/block-meta.json"), fs.promises.copyFile("demo/api/block-meta.json", "demo/site/block-meta.json"), diff --git a/demo/admin/src/emailCampaigns/blocks/EmailCampaignContentBlock.tsx b/demo/admin/src/emailCampaigns/blocks/EmailCampaignContentBlock.tsx index 0c3b9473..b357d90f 100644 --- a/demo/admin/src/emailCampaigns/blocks/EmailCampaignContentBlock.tsx +++ b/demo/admin/src/emailCampaigns/blocks/EmailCampaignContentBlock.tsx @@ -1,5 +1,5 @@ import { createBlocksBlock } from "@comet/blocks-admin"; -import { PixelImageBlock } from "@comet/cms-admin"; +import { NewsletterImageBlock } from "@comet/brevo-admin"; import { RichTextBlock } from "@src/common/blocks/RichTextBlock"; import { DividerBlock } from "./DividerBlock"; @@ -11,6 +11,6 @@ export const EmailCampaignContentBlock = createBlocksBlock({ divider: DividerBlock, text: RichTextBlock, salutation: EmailCampaignSalutationBlock, - image: PixelImageBlock, + image: NewsletterImageBlock, }, }); diff --git a/demo/api/block-meta.json b/demo/api/block-meta.json index c1613026..26cd6ea2 100644 --- a/demo/api/block-meta.json +++ b/demo/api/block-meta.json @@ -286,7 +286,7 @@ "text": "RichText", "divider": "EmailCampaignDivider", "salutation": "EmailCampaignSalutation", - "image": "PixelImage" + "image": "NewsletterImage" }, "nullable": false } @@ -323,7 +323,7 @@ "text": "RichText", "divider": "EmailCampaignDivider", "salutation": "EmailCampaignSalutation", - "image": "PixelImage" + "image": "NewsletterImage" }, "nullable": false } @@ -663,6 +663,25 @@ } ] }, + { + "name": "NewsletterImage", + "fields": [ + { + "name": "image", + "kind": "Block", + "block": "PixelImage", + "nullable": false + } + ], + "inputFields": [ + { + "name": "image", + "kind": "Block", + "block": "PixelImage", + "nullable": false + } + ] + }, { "name": "OptionalPixelImage", "fields": [ diff --git a/demo/api/src/email-campaign/blocks/email-campaign-content.block.ts b/demo/api/src/email-campaign/blocks/email-campaign-content.block.ts index d1ca132a..0d76eeca 100644 --- a/demo/api/src/email-campaign/blocks/email-campaign-content.block.ts +++ b/demo/api/src/email-campaign/blocks/email-campaign-content.block.ts @@ -1,5 +1,5 @@ import { createBlocksBlock } from "@comet/blocks-api"; -import { PixelImageBlock } from "@comet/cms-api"; +import { NewsletterImageBlock } from "@comet/brevo-api"; import { EmailCampaignDividerBlock } from "./email-campaign-divider.block"; import { EmailCampaignRichTextBlock } from "./email-campaign-rich-text.block"; @@ -11,7 +11,7 @@ export const EmailCampaignContentBlock = createBlocksBlock( text: EmailCampaignRichTextBlock, divider: EmailCampaignDividerBlock, salutation: EmailCampaignSalutationBlock, - image: PixelImageBlock, + image: NewsletterImageBlock, }, }, { diff --git a/demo/campaign/src/blocks/ContentBlock.tsx b/demo/campaign/src/blocks/ContentBlock.tsx index f840d18e..429be19e 100644 --- a/demo/campaign/src/blocks/ContentBlock.tsx +++ b/demo/campaign/src/blocks/ContentBlock.tsx @@ -1,17 +1,17 @@ +import { NewsletterImageBlock } from "@comet/brevo-mail-rendering"; import { BlocksBlock, SupportedBlocks } from "@comet/cms-site"; import { EmailCampaignContentBlockData } from "@src/blocks.generated"; import { RichTextBlock } from "@src/blocks//RichTextBlock"; import { DividerBlock } from "@src/blocks/DividerBlock"; import React from "react"; -import { ImageBlock } from "./ImageBlock"; import { SalutationBlock } from "./SalutationBlock"; const supportedBlocks: SupportedBlocks = { divider: (data) => , text: (data) => , salutation: (data) => , - image: (data) => , + image: (data) => , }; interface Props { diff --git a/dev-pm.config.js b/dev-pm.config.js index cc4c2d4d..bdc8c9ce 100644 --- a/dev-pm.config.js +++ b/dev-pm.config.js @@ -21,6 +21,11 @@ module.exports = { script: "pnpm --filter @comet/brevo-api run generate-schema:watch", group: ["api"], }, + { + name: "api-codegen-block-meta", + script: "pnpm --filter @comet/brevo-api run generate-block-meta:watch", + group: ["api"], + }, //group admin { name: "admin", @@ -33,6 +38,11 @@ module.exports = { script: "pnpm --filter @comet/brevo-mail-rendering run dev", group: ["mail-rendering"], }, + { + name: "mail-rendering-block-codegen", + script: "pnpm --filter @comet/brevo-mail-rendering run generate-block-types:watch", + group: ["mail-rendering"], + }, //group demo admin { name: "demo-admin", diff --git a/install.sh b/install.sh index a993508b..de3a1694 100755 --- a/install.sh +++ b/install.sh @@ -22,6 +22,9 @@ pnpm install # create admin symlinks ln -sf ../api/schema.gql ./packages/admin/schema.gql +# create mail-rendering symlinks +ln -sf ../api/block-meta.json ./packages/mail-rendering/block-meta.json + # create demo api symlinks ln -sf ../../.env ./demo/api/.env ln -sf ../../.env.local ./demo/api diff --git a/packages/admin/src/blocks/NewsletterImageBlock.tsx b/packages/admin/src/blocks/NewsletterImageBlock.tsx new file mode 100644 index 00000000..0616251d --- /dev/null +++ b/packages/admin/src/blocks/NewsletterImageBlock.tsx @@ -0,0 +1,16 @@ +import { BlockCategory, createCompositeBlock } from "@comet/blocks-admin"; +import { PixelImageBlock } from "@comet/cms-admin"; +import React from "react"; +import { FormattedMessage } from "react-intl"; + +export const NewsletterImageBlock = createCompositeBlock({ + name: "NewsletterImage", + displayName: , + category: BlockCategory.Media, + blocks: { + image: { + block: PixelImageBlock, + title: , + }, + }, +}); diff --git a/packages/admin/src/index.ts b/packages/admin/src/index.ts index d69bcaac..dfae174e 100644 --- a/packages/admin/src/index.ts +++ b/packages/admin/src/index.ts @@ -1,3 +1,4 @@ +export { NewsletterImageBlock } from "./blocks/NewsletterImageBlock"; export { BrevoConfigPage } from "./brevoConfiguration/BrevoConfigPage"; export { createBrevoContactsPage } from "./brevoContacts/BrevoContactsPage"; export { EditBrevoContactFormValues } from "./brevoContacts/form/BrevoContactForm"; diff --git a/packages/api/.gitignore b/packages/api/.gitignore index 7951405f..a65b4177 100644 --- a/packages/api/.gitignore +++ b/packages/api/.gitignore @@ -1 +1 @@ -lib \ No newline at end of file +lib diff --git a/packages/api/.prettierignore b/packages/api/.prettierignore index f1ff06d6..960a5408 100644 --- a/packages/api/.prettierignore +++ b/packages/api/.prettierignore @@ -1 +1,2 @@ -lib/ \ No newline at end of file +lib/ +block-meta.json \ No newline at end of file diff --git a/packages/api/block-meta.json b/packages/api/block-meta.json new file mode 100644 index 00000000..0be6ed46 --- /dev/null +++ b/packages/api/block-meta.json @@ -0,0 +1,827 @@ +[ + { + "name": "Anchor", + "fields": [ + { + "name": "name", + "kind": "String", + "nullable": true + } + ], + "inputFields": [ + { + "name": "name", + "kind": "String", + "nullable": true + } + ] + }, + { + "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 + }, + { + "name": "size", + "kind": "Number", + "nullable": false + }, + { + "name": "scope", + "kind": "Json", + "nullable": true + } + ] + }, + "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": [ + { + "name": "attachedBlocks", + "kind": "NestedObjectList", + "object": { + "fields": [ + { + "name": "type", + "kind": "String", + "nullable": false + }, + { + "name": "props", + "kind": "OneOfBlocks", + "blocks": { + "pixelImage": "PixelImage", + "svgImage": "SvgImage" + }, + "nullable": false + } + ] + }, + "nullable": false + }, + { + "name": "activeType", + "kind": "String", + "nullable": true + }, + { + "name": "block", + "kind": "NestedObject", + "object": { + "fields": [ + { + "name": "type", + "kind": "String", + "nullable": false + }, + { + "name": "props", + "kind": "OneOfBlocks", + "blocks": { + "pixelImage": "PixelImage", + "svgImage": "SvgImage" + }, + "nullable": false + } + ] + }, + "nullable": true + } + ], + "inputFields": [ + { + "name": "activeType", + "kind": "String", + "nullable": false + } + ] + }, + { + "name": "DamVideo", + "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": "damFile", + "kind": "NestedObject", + "object": { + "fields": [ + { + "name": "id", + "kind": "String", + "nullable": false + }, + { + "name": "name", + "kind": "String", + "nullable": false + }, + { + "name": "size", + "kind": "Number", + "nullable": false + }, + { + "name": "mimetype", + "kind": "String", + "nullable": false + }, + { + "name": "contentHash", + "kind": "String", + "nullable": false + }, + { + "name": "title", + "kind": "String", + "nullable": true + }, + { + "name": "altText", + "kind": "String", + "nullable": true + }, + { + "name": "archived", + "kind": "Boolean", + "nullable": false + }, + { + "name": "scope", + "kind": "Json", + "nullable": true + }, + { + "name": "fileUrl", + "kind": "String", + "nullable": false + } + ] + }, + "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": "damFileId", + "kind": "String", + "nullable": true + } + ] + }, + { + "name": "EmailLink", + "fields": [ + { + "name": "email", + "kind": "String", + "nullable": true + } + ], + "inputFields": [ + { + "name": "email", + "kind": "String", + "nullable": true + } + ] + }, + { + "name": "ExternalLink", + "fields": [ + { + "name": "targetUrl", + "kind": "String", + "nullable": true + }, + { + "name": "openInNewWindow", + "kind": "Boolean", + "nullable": false + } + ], + "inputFields": [ + { + "name": "targetUrl", + "kind": "String", + "nullable": true + }, + { + "name": "openInNewWindow", + "kind": "Boolean", + "nullable": false + } + ] + }, + { + "name": "InternalLink", + "fields": [ + { + "name": "targetPageAnchor", + "kind": "String", + "nullable": true + }, + { + "name": "targetPage", + "kind": "NestedObject", + "object": { + "fields": [ + { + "name": "id", + "kind": "String", + "nullable": false + }, + { + "name": "name", + "kind": "String", + "nullable": false + }, + { + "name": "path", + "kind": "String", + "nullable": false + }, + { + "name": "scope", + "kind": "Json", + "nullable": true + }, + { + "name": "documentType", + "kind": "String", + "nullable": false + } + ] + }, + "nullable": true + } + ], + "inputFields": [ + { + "name": "targetPageId", + "kind": "String", + "nullable": true + }, + { + "name": "targetPageAnchor", + "kind": "String", + "nullable": true + } + ] + }, + { + "name": "NewsletterImage", + "fields": [ + { + "name": "image", + "kind": "Block", + "block": "PixelImage", + "nullable": false + } + ], + "inputFields": [ + { + "name": "image", + "kind": "Block", + "block": "PixelImage", + "nullable": false + } + ] + }, + { + "name": "PhoneLink", + "fields": [ + { + "name": "phone", + "kind": "String", + "nullable": true + } + ], + "inputFields": [ + { + "name": "phone", + "kind": "String", + "nullable": true + } + ] + }, + { + "name": "PixelImage", + "fields": [ + { + "name": "damFile", + "kind": "NestedObject", + "object": { + "fields": [ + { + "name": "id", + "kind": "String", + "nullable": false + }, + { + "name": "name", + "kind": "String", + "nullable": false + }, + { + "name": "size", + "kind": "Number", + "nullable": false + }, + { + "name": "mimetype", + "kind": "String", + "nullable": false + }, + { + "name": "contentHash", + "kind": "String", + "nullable": false + }, + { + "name": "title", + "kind": "String", + "nullable": true + }, + { + "name": "altText", + "kind": "String", + "nullable": true + }, + { + "name": "archived", + "kind": "Boolean", + "nullable": false + }, + { + "name": "scope", + "kind": "Json", + "nullable": true + }, + { + "name": "image", + "kind": "NestedObject", + "object": { + "fields": [ + { + "name": "width", + "kind": "Number", + "nullable": false + }, + { + "name": "height", + "kind": "Number", + "nullable": false + }, + { + "name": "cropArea", + "kind": "NestedObject", + "object": { + "fields": [ + { + "name": "focalPoint", + "kind": "Enum", + "enum": [ + "SMART", + "CENTER", + "NORTHWEST", + "NORTHEAST", + "SOUTHWEST", + "SOUTHEAST" + ], + "nullable": false + }, + { + "name": "width", + "kind": "Number", + "nullable": true + }, + { + "name": "height", + "kind": "Number", + "nullable": true + }, + { + "name": "x", + "kind": "Number", + "nullable": true + }, + { + "name": "y", + "kind": "Number", + "nullable": true + } + ] + }, + "nullable": false + }, + { + "name": "dominantColor", + "kind": "String", + "nullable": true + } + ] + }, + "nullable": true + }, + { + "name": "fileUrl", + "kind": "String", + "nullable": false + } + ] + }, + "nullable": true + }, + { + "name": "cropArea", + "kind": "NestedObject", + "object": { + "fields": [ + { + "name": "focalPoint", + "kind": "Enum", + "enum": [ + "SMART", + "CENTER", + "NORTHWEST", + "NORTHEAST", + "SOUTHWEST", + "SOUTHEAST" + ], + "nullable": false + }, + { + "name": "width", + "kind": "Number", + "nullable": true + }, + { + "name": "height", + "kind": "Number", + "nullable": true + }, + { + "name": "x", + "kind": "Number", + "nullable": true + }, + { + "name": "y", + "kind": "Number", + "nullable": true + } + ] + }, + "nullable": true + }, + { + "name": "urlTemplate", + "kind": "String", + "nullable": false + } + ], + "inputFields": [ + { + "name": "damFileId", + "kind": "String", + "nullable": true + }, + { + "name": "cropArea", + "kind": "NestedObject", + "object": { + "fields": [ + { + "name": "focalPoint", + "kind": "Enum", + "enum": [ + "SMART", + "CENTER", + "NORTHWEST", + "NORTHEAST", + "SOUTHWEST", + "SOUTHEAST" + ], + "nullable": false + }, + { + "name": "width", + "kind": "Number", + "nullable": true + }, + { + "name": "height", + "kind": "Number", + "nullable": true + }, + { + "name": "x", + "kind": "Number", + "nullable": true + }, + { + "name": "y", + "kind": "Number", + "nullable": true + } + ] + }, + "nullable": true + } + ] + }, + { + "name": "Space", + "fields": [ + { + "name": "height", + "kind": "Number", + "nullable": false + } + ], + "inputFields": [ + { + "name": "height", + "kind": "Number", + "nullable": false + } + ] + }, + { + "name": "SvgImage", + "fields": [ + { + "name": "damFile", + "kind": "NestedObject", + "object": { + "fields": [ + { + "name": "id", + "kind": "String", + "nullable": false + }, + { + "name": "name", + "kind": "String", + "nullable": false + }, + { + "name": "size", + "kind": "Number", + "nullable": false + }, + { + "name": "mimetype", + "kind": "String", + "nullable": false + }, + { + "name": "contentHash", + "kind": "String", + "nullable": false + }, + { + "name": "title", + "kind": "String", + "nullable": true + }, + { + "name": "altText", + "kind": "String", + "nullable": true + }, + { + "name": "archived", + "kind": "Boolean", + "nullable": false + }, + { + "name": "scope", + "kind": "Json", + "nullable": true + }, + { + "name": "fileUrl", + "kind": "String", + "nullable": false + } + ] + }, + "nullable": true + } + ], + "inputFields": [ + { + "name": "damFileId", + "kind": "String", + "nullable": true + } + ] + }, + { + "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": [ + { + "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": "youtubeIdentifier", + "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": "youtubeIdentifier", + "kind": "String", + "nullable": true + } + ] + } +] \ No newline at end of file diff --git a/packages/api/generate-block-meta.ts b/packages/api/generate-block-meta.ts new file mode 100644 index 00000000..89c7333b --- /dev/null +++ b/packages/api/generate-block-meta.ts @@ -0,0 +1,17 @@ +import { getBlocksMeta } from "@comet/blocks-api"; +import { promises as fs } from "fs"; + +import { NewsletterImageBlock } from "./src"; + +async function generateBlockMeta(): Promise { + console.info("Generating block-meta.json..."); + + NewsletterImageBlock; // Has to be defined so the block is registered for getBlocksMeta() + + const metaJson = getBlocksMeta(); + await fs.writeFile("block-meta.json", JSON.stringify(metaJson, null, 4)); + + console.info("Done!"); +} + +generateBlockMeta(); diff --git a/packages/api/package.json b/packages/api/package.json index 7f6fecd5..cc46cda7 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -16,6 +16,8 @@ "build": "$npm_execpath run clean && tsc -p tsconfig.build.json", "clean": "rimraf lib", "dev": "tsc --watch --preserveWatchOutput -p tsconfig.build.json", + "generate-block-meta": "ts-node generate-block-meta.ts", + "generate-block-meta:watch": "chokidar \"src/\" -c \"$npm_execpath generate-block-meta\"", "generate-schema": "ts-node generate-schema.ts", "generate-schema:watch": "chokidar \"src/\" -c \"$npm_execpath generate-schema\"", "lint": "run-p lint:eslint lint:tsc", diff --git a/packages/api/src/blocks/newsletter-image.block.ts b/packages/api/src/blocks/newsletter-image.block.ts new file mode 100644 index 00000000..56c38788 --- /dev/null +++ b/packages/api/src/blocks/newsletter-image.block.ts @@ -0,0 +1,27 @@ +import { + BlockData, + BlockDataInterface, + BlockInput, + ChildBlock, + ChildBlockInput, + createBlock, + ExtractBlockInput, + inputToData, +} from "@comet/blocks-api"; +import { PixelImageBlock } from "@comet/cms-api"; + +export class NewsletterImageBlockData extends BlockData { + @ChildBlock(PixelImageBlock) + image: BlockDataInterface; +} +export class NewsletterImageBlockInput extends BlockInput { + @ChildBlockInput(PixelImageBlock) + image: ExtractBlockInput; + + transformToBlockData(): NewsletterImageBlockData { + return inputToData(NewsletterImageBlockData, this); + } +} +export const NewsletterImageBlock = createBlock(NewsletterImageBlockData, NewsletterImageBlockInput, { + name: "NewsletterImage", +}); diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts index 6041cd33..95047c56 100644 --- a/packages/api/src/index.ts +++ b/packages/api/src/index.ts @@ -1,3 +1,4 @@ +export { NewsletterImageBlock } from "./blocks/newsletter-image.block"; export { BrevoTransactionalMailsService } from "./brevo-api/brevo-api-transactional-mails.service"; export { BrevoContactsService } from "./brevo-contact/brevo-contacts.service"; export { SubscribeResponse } from "./brevo-contact/dto/subscribe-response.enum"; diff --git a/packages/mail-rendering/.gitignore b/packages/mail-rendering/.gitignore index 7951405f..35513e72 100644 --- a/packages/mail-rendering/.gitignore +++ b/packages/mail-rendering/.gitignore @@ -1 +1,3 @@ -lib \ No newline at end of file +lib +block-meta.json +src/blocks.generated.ts \ No newline at end of file diff --git a/packages/mail-rendering/.prettierignore b/packages/mail-rendering/.prettierignore new file mode 100644 index 00000000..960a5408 --- /dev/null +++ b/packages/mail-rendering/.prettierignore @@ -0,0 +1,2 @@ +lib/ +block-meta.json \ No newline at end of file diff --git a/packages/mail-rendering/package.json b/packages/mail-rendering/package.json index 396c8da9..7385647c 100644 --- a/packages/mail-rendering/package.json +++ b/packages/mail-rendering/package.json @@ -13,18 +13,25 @@ "lib/*" ], "scripts": { - "build": "$npm_execpath run clean && tsc -p tsconfig.build.json", - "clean": "rimraf lib", - "dev": "tsc --watch --preserveWatchOutput -p tsconfig.build.json", - "lint": "run-p lint:eslint lint:prettier lint:tsc", + "build": "$npm_execpath run clean && npm run generate-block-types && tsc -p tsconfig.build.json", + "clean": "rimraf lib 'src/**/*.generated.ts'", + "dev": "$npm_execpath generate-block-types && tsc --watch --preserveWatchOutput -p tsconfig.build.json", + "generate-block-types": "comet generate-block-types", + "generate-block-types:watch": "chokidar -s \"**/block-meta.json\" -c \"$npm_execpath generate-block-types\"", + "lint": "$npm_execpath generate-block-types && run-p lint:eslint lint:prettier 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" }, + "dependencies": { + "@comet/cli": "^7.7.0", + "@comet/cms-site": "^7.7.0" + }, "devDependencies": { "@comet/eslint-config": "^7.7.0", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", + "chokidar-cli": "^2.0.0", "eslint": "^8.0.0", "npm-run-all2": "^5.0.2", "react": "^18.3.1", diff --git a/packages/mail-rendering/src/blocks/ImageBlock.tsx b/packages/mail-rendering/src/blocks/ImageBlock.tsx deleted file mode 100644 index 6590ec2e..00000000 --- a/packages/mail-rendering/src/blocks/ImageBlock.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export const ImageBlock = () => { - return null; -}; diff --git a/packages/mail-rendering/src/blocks/NewsletterImageBlock.tsx b/packages/mail-rendering/src/blocks/NewsletterImageBlock.tsx new file mode 100644 index 00000000..97067d0a --- /dev/null +++ b/packages/mail-rendering/src/blocks/NewsletterImageBlock.tsx @@ -0,0 +1,7 @@ +import { PropsWithData } from "@comet/cms-site"; + +import { NewsletterImageBlockData } from "../blocks.generated"; + +export const NewsletterImageBlock = ({ data }: PropsWithData) => { + return null; +}; diff --git a/packages/mail-rendering/src/index.ts b/packages/mail-rendering/src/index.ts index 34f3adf0..c4342938 100644 --- a/packages/mail-rendering/src/index.ts +++ b/packages/mail-rendering/src/index.ts @@ -1 +1 @@ -export { ImageBlock } from "./blocks/ImageBlock"; +export { NewsletterImageBlock } from "./blocks/NewsletterImageBlock"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6e81ae50..abba0fb3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1053,6 +1053,13 @@ importers: version: 8.3.2 packages/mail-rendering: + dependencies: + '@comet/cli': + specifier: ^7.7.0 + version: 7.7.0(ts-node@10.9.2) + '@comet/cms-site': + specifier: ^7.7.0 + version: 7.7.0(@types/react@18.3.12)(next@14.2.18)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) devDependencies: '@comet/eslint-config': specifier: ^7.7.0 @@ -1063,6 +1070,9 @@ importers: '@types/react-dom': specifier: ^18.3.1 version: 18.3.1 + chokidar-cli: + specifier: ^2.0.0 + version: 2.1.0 eslint: specifier: ^8.0.0 version: 8.56.0 @@ -4094,7 +4104,6 @@ packages: 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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.9.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-FARsHyD2+c6ba1yObRG4yosJ7eJPT1Tnx6vLrdriCcsy6T5rGZLr1oJKT5rNKkb/Yw+SbNXrqEvIes+8jpBVHw==} @@ -18653,7 +18662,6 @@ packages: resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} engines: {node: '>=10.13.0'} hasBin: true - dev: true /pretty-bytes@5.6.0: resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==} From ea503b92bb02e0db65396b1ba3ba29aa6bac7188 Mon Sep 17 00:00:00 2001 From: juliawegmayr <109900447+juliawegmayr@users.noreply.github.com> Date: Tue, 21 Jan 2025 10:08:29 +0100 Subject: [PATCH 117/121] Config for unsubscribe page (#117) --- .changeset/weak-points-tan.md | 6 ++++ demo/api/schema.gql | 3 ++ .../brevoConfiguration/BrevoConfigForm.gql.ts | 1 + .../brevoConfiguration/BrevoConfigForm.tsx | 31 ++++++++++++++++++- packages/api/schema.gql | 3 ++ .../brevo-api/brevo-api-campaigns.service.ts | 3 ++ .../brevo-config/dto/brevo-config.input.ts | 8 ++++- .../entities/brevo-config-entity.factory.ts | 5 +++ .../email-campaign/email-campaigns.service.ts | 1 + .../entities/email-campaign-entity.factory.ts | 1 + .../migrations/Migration20241024071748.ts | 7 +++++ .../src/mikro-orm/migrations/migrations.ts | 2 ++ 12 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 .changeset/weak-points-tan.md create mode 100644 packages/api/src/mikro-orm/migrations/Migration20241024071748.ts diff --git a/.changeset/weak-points-tan.md b/.changeset/weak-points-tan.md new file mode 100644 index 00000000..9c0b1746 --- /dev/null +++ b/.changeset/weak-points-tan.md @@ -0,0 +1,6 @@ +--- +"@comet/brevo-admin": minor +"@comet/brevo-api": minor +--- + +Add a brevo configuration field for `unsubscriptionPageId` diff --git a/demo/api/schema.gql b/demo/api/schema.gql index 81908efb..abecc077 100644 --- a/demo/api/schema.gql +++ b/demo/api/schema.gql @@ -508,6 +508,7 @@ type BrevoConfig implements DocumentInterface { doubleOptInTemplateId: Int! folderId: Int! allowedRedirectionUrl: String! + unsubscriptionPageId: String! createdAt: DateTime! scope: EmailCampaignContentScope! } @@ -1036,6 +1037,7 @@ input BrevoConfigInput { doubleOptInTemplateId: Int! folderId: Int! allowedRedirectionUrl: String! + unsubscriptionPageId: String! } input BrevoConfigUpdateInput { @@ -1044,4 +1046,5 @@ input BrevoConfigUpdateInput { doubleOptInTemplateId: Int folderId: Int allowedRedirectionUrl: String + unsubscriptionPageId: String } diff --git a/packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts b/packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts index 80b28b0e..73e7d5c6 100644 --- a/packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts +++ b/packages/admin/src/brevoConfiguration/BrevoConfigForm.gql.ts @@ -7,6 +7,7 @@ export const brevoConfigFormFragment = gql` doubleOptInTemplateId folderId allowedRedirectionUrl + unsubscriptionPageId } `; diff --git a/packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx b/packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx index 6804e50f..52383908 100644 --- a/packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx +++ b/packages/admin/src/brevoConfiguration/BrevoConfigForm.tsx @@ -52,6 +52,7 @@ type FormValues = { doubleOptInTemplate: Option; folderId: number; allowedRedirectionUrl: string; + unsubscriptionPageId: string; }; interface FormProps { @@ -128,6 +129,7 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { : undefined, allowedRedirectionUrl: data?.brevoConfig?.allowedRedirectionUrl ?? "", folderId: data?.brevoConfig?.folderId ?? 1, + unsubscriptionPageId: data?.brevoConfig?.unsubscriptionPageId ?? "", }; }, [ data?.brevoConfig?.folderId, @@ -137,6 +139,7 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { data?.brevoConfig?.senderMail, data?.brevoConfig?.senderName, doubleOptInTemplatesData?.doubleOptInTemplates, + data?.brevoConfig?.unsubscriptionPageId, sendersData?.senders, ]); @@ -170,7 +173,7 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { const sender = sendersData?.senders?.find((s) => s.email === state.sender.value); - if (!sender || !state.doubleOptInTemplate || !state.allowedRedirectionUrl) { + if (!sender || !state.doubleOptInTemplate || !state.allowedRedirectionUrl || !state.unsubscriptionPageId) { throw new Error("Not all required fields are set"); } @@ -180,6 +183,7 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { doubleOptInTemplateId: Number(state.doubleOptInTemplate.value), folderId: state.folderId ?? 1, allowedRedirectionUrl: state?.allowedRedirectionUrl ?? "", + unsubscriptionPageId: state.unsubscriptionPageId, }; if (mode === "edit") { @@ -215,6 +219,19 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { return ; } + const validateUnsubscriptionPageId = (value: string) => { + const validUnsubscriptionPageId = /^[a-zA-Z0-9]{24}$/; + if (!validUnsubscriptionPageId.test(value)) { + return ( + + ); + } + return undefined; + }; + return ( apiRef={formApiRef} onSubmit={handleSubmit} mode={mode} initialValues={initialValues}> {({ values }) => { @@ -303,6 +320,18 @@ export function BrevoConfigForm({ scope }: FormProps): React.ReactElement { } validate={validateUrl} /> + + } + validate={validateUnsubscriptionPageId} + /> ); diff --git a/packages/api/schema.gql b/packages/api/schema.gql index d4e98867..7da0d8cc 100644 --- a/packages/api/schema.gql +++ b/packages/api/schema.gql @@ -210,6 +210,7 @@ type BrevoConfig implements DocumentInterface { doubleOptInTemplateId: Int! folderId: Int! allowedRedirectionUrl: String! + unsubscriptionPageId: String! createdAt: DateTime! scope: EmailCampaignContentScope! } @@ -401,6 +402,7 @@ input BrevoConfigInput { doubleOptInTemplateId: Int! folderId: Int! allowedRedirectionUrl: String! + unsubscriptionPageId: String! } input BrevoConfigUpdateInput { @@ -409,4 +411,5 @@ input BrevoConfigUpdateInput { doubleOptInTemplateId: Int folderId: Int allowedRedirectionUrl: String + unsubscriptionPageId: String } diff --git a/packages/api/src/brevo-api/brevo-api-campaigns.service.ts b/packages/api/src/brevo-api/brevo-api-campaigns.service.ts index f1d8dab5..062f65ff 100644 --- a/packages/api/src/brevo-api/brevo-api-campaigns.service.ts +++ b/packages/api/src/brevo-api/brevo-api-campaigns.service.ts @@ -59,11 +59,13 @@ export class BrevoApiCampaignsService { htmlContent, sender, scheduledAt, + unsubscriptionPageId, }: { campaign: EmailCampaignInterface; htmlContent: string; sender: { name: string; mail: string }; scheduledAt?: Date; + unsubscriptionPageId?: string; }): Promise { try { const targetGroups = await campaign.targetGroups.loadItems(); @@ -75,6 +77,7 @@ export class BrevoApiCampaignsService { recipients: { listIds: targetGroups.map((targetGroup) => targetGroup.brevoId) }, htmlContent, scheduledAt: scheduledAt?.toISOString(), + unsubscriptionPageId, }; const data = await this.getCampaignsApi(campaign.scope).createEmailCampaign(emailCampaign); diff --git a/packages/api/src/brevo-config/dto/brevo-config.input.ts b/packages/api/src/brevo-config/dto/brevo-config.input.ts index 955dab4f..21af21cd 100644 --- a/packages/api/src/brevo-config/dto/brevo-config.input.ts +++ b/packages/api/src/brevo-config/dto/brevo-config.input.ts @@ -1,6 +1,6 @@ import { PartialType } from "@comet/cms-api"; import { Field, InputType, Int } from "@nestjs/graphql"; -import { IsEmail, IsInt, IsNotEmpty, IsString, IsUrl } from "class-validator"; +import { IsAlphanumeric, IsEmail, IsInt, IsNotEmpty, IsString, IsUrl, Length } from "class-validator"; @InputType() export class BrevoConfigInput { @@ -27,6 +27,12 @@ export class BrevoConfigInput { @Field() @IsUrl({ require_tld: process.env.NODE_ENV === "production" }) allowedRedirectionUrl: string; + + @IsString() + @Field() + @Length(24) + @IsAlphanumeric() + unsubscriptionPageId: string; } @InputType() diff --git a/packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts b/packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts index c295388d..2c606bc2 100644 --- a/packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts +++ b/packages/api/src/brevo-config/entities/brevo-config-entity.factory.ts @@ -14,6 +14,7 @@ export interface BrevoConfigInterface { doubleOptInTemplateId: number; folderId: number; allowedRedirectionUrl: string; + unsubscriptionPageId: string; createdAt: Date; updatedAt: Date; scope: EmailCampaignScopeInterface; @@ -52,6 +53,10 @@ export class BrevoConfigEntityFactory { @Field() allowedRedirectionUrl: string; + @Property({ columnType: "text" }) + @Field(() => String) + unsubscriptionPageId: string; + @Property({ columnType: "timestamp with time zone", }) diff --git a/packages/api/src/email-campaign/email-campaigns.service.ts b/packages/api/src/email-campaign/email-campaigns.service.ts index d1d870ed..e6246f51 100644 --- a/packages/api/src/email-campaign/email-campaigns.service.ts +++ b/packages/api/src/email-campaign/email-campaigns.service.ts @@ -72,6 +72,7 @@ export class EmailCampaignsService { htmlContent, sender: { name: brevoConfig.senderName, mail: brevoConfig.senderMail }, scheduledAt, + unsubscriptionPageId: brevoConfig.unsubscriptionPageId, }); wrap(campaign).assign({ brevoId }); diff --git a/packages/api/src/email-campaign/entities/email-campaign-entity.factory.ts b/packages/api/src/email-campaign/entities/email-campaign-entity.factory.ts index 4dde972c..b008500d 100644 --- a/packages/api/src/email-campaign/entities/email-campaign-entity.factory.ts +++ b/packages/api/src/email-campaign/entities/email-campaign-entity.factory.ts @@ -22,6 +22,7 @@ export interface EmailCampaignInterface { scope: EmailCampaignScopeInterface; sendingState: SendingState; targetGroups: Collection; + unsubscriptionPageId?: string; } export function createEmailCampaignEntity({ diff --git a/packages/api/src/mikro-orm/migrations/Migration20241024071748.ts b/packages/api/src/mikro-orm/migrations/Migration20241024071748.ts new file mode 100644 index 00000000..e4c02ffd --- /dev/null +++ b/packages/api/src/mikro-orm/migrations/Migration20241024071748.ts @@ -0,0 +1,7 @@ +import { Migration } from "@mikro-orm/migrations"; + +export class Migration20241024071748 extends Migration { + async up(): Promise { + this.addSql('alter table "BrevoConfig" add column "unsubscriptionPageId" text not null;'); + } +} diff --git a/packages/api/src/mikro-orm/migrations/migrations.ts b/packages/api/src/mikro-orm/migrations/migrations.ts index ebb9a181..340da691 100644 --- a/packages/api/src/mikro-orm/migrations/migrations.ts +++ b/packages/api/src/mikro-orm/migrations/migrations.ts @@ -12,6 +12,7 @@ import { Migration20240830112400 } from "./Migration20240830112400"; import { Migration20241016123307 } from "./Migration20241016123307"; import { Migration20241018110515 } from "./Migration20241018110515"; import { Migration20241022144400 } from "./Migration20241022144400"; +import { Migration20241024071748 } from "./Migration20241024071748"; import { Migration20241119101706 } from "./Migration20241119101706"; export const migrationsList: MigrationObject[] = [ @@ -28,4 +29,5 @@ export const migrationsList: MigrationObject[] = [ { name: "Migration20241018110515", class: Migration20241018110515 }, { name: "Migration20241119101706", class: Migration20241119101706 }, { name: "Migration20241022144400", class: Migration20241022144400 }, + { name: "Migration20241024071748", class: Migration20241024071748 }, ]; From 1945d87332c7e01cf6a2b9580b2e3dffe9fde51f Mon Sep 17 00:00:00 2001 From: juliawegmayr <109900447+juliawegmayr@users.noreply.github.com> Date: Tue, 21 Jan 2025 11:11:44 +0100 Subject: [PATCH 118/121] Style image block (#256) --- demo/admin/package.json | 16 +- demo/api/package.json | 8 +- demo/api/schema.gql | 26 +- demo/api/src/comet-config.json | 2 +- demo/campaign/package.json | 6 +- demo/site/package.json | 6 +- install.sh | 3 +- packages/admin/package.json | 24 +- packages/api/package.json | 12 +- packages/mail-rendering/package.json | 19 +- .../src/blocks/CommonImageBlock.tsx | 45 ++ .../src/blocks/NewsletterImageBlock.tsx | 17 +- .../src/blocks/helpers/imageBlockHelpers.ts | 55 +++ pnpm-lock.yaml | 441 +++++++----------- 14 files changed, 348 insertions(+), 332 deletions(-) create mode 100644 packages/mail-rendering/src/blocks/CommonImageBlock.tsx create mode 100644 packages/mail-rendering/src/blocks/helpers/imageBlockHelpers.ts diff --git a/demo/admin/package.json b/demo/admin/package.json index 648d0aa5..d805b703 100644 --- a/demo/admin/package.json +++ b/demo/admin/package.json @@ -25,13 +25,13 @@ "dependencies": { "@apollo/client": "^3.12.2", "@babel/core": "^7.26.0", - "@comet/admin": "^7.7.0", - "@comet/admin-icons": "^7.7.0", - "@comet/admin-rte": "^7.7.0", - "@comet/admin-theme": "^7.7.0", - "@comet/blocks-admin": "^7.7.0", + "@comet/admin": "^7.10.0", + "@comet/admin-icons": "^7.10.0", + "@comet/admin-rte": "^7.10.0", + "@comet/admin-theme": "^7.10.0", + "@comet/blocks-admin": "^7.10.0", "@comet/brevo-admin": "workspace:*", - "@comet/cms-admin": "^7.7.0", + "@comet/cms-admin": "^7.10.0", "@emotion/react": "^11.9.3", "@emotion/styled": "^11.9.3", "@fontsource-variable/roboto-flex": "^5.1.0", @@ -61,8 +61,8 @@ "react-router-dom": "^5.3.4" }, "devDependencies": { - "@comet/cli": "^7.7.0", - "@comet/eslint-config": "^7.7.0", + "@comet/cli": "^7.10.0", + "@comet/eslint-config": "^7.10.0", "@emotion/babel-plugin": "^11.0.0", "@formatjs/cli": "^3.2.0", "@gitbeaker/node": "^35.8.1", diff --git a/demo/api/package.json b/demo/api/package.json index 4d5fb4c6..15b14551 100644 --- a/demo/api/package.json +++ b/demo/api/package.json @@ -49,9 +49,9 @@ } }, "dependencies": { - "@comet/blocks-api": "^7.7.0", + "@comet/blocks-api": "^7.10.0", "@comet/brevo-api": "workspace:*", - "@comet/cms-api": "^7.7.0", + "@comet/cms-api": "^7.10.0", "@faker-js/faker": "^8.4.1", "@hapi/accept": "^5.0.2", "@kubernetes/client-node": "^0.18.0", @@ -74,7 +74,7 @@ "apollo-server-core": "^3.13.0", "apollo-server-express": "^3.13.0", "class-transformer": "^0.5.1", - "class-validator": "^0.14.1", + "class-validator": "^0.13.2", "cli-progress": "^3.12.0", "commander": "^7.2.0", "compression": "^1.7.5", @@ -98,7 +98,7 @@ "webpack": "^5.64.2" }, "devDependencies": { - "@comet/eslint-config": "^7.7.0", + "@comet/eslint-config": "^7.10.0", "@nestjs/cli": "^9.5.0", "@nestjs/schematics": "^9.2.0", "@nestjs/testing": "^9.4.3", diff --git a/demo/api/schema.gql b/demo/api/schema.gql index 8a0ea14b..79ed93d4 100644 --- a/demo/api/schema.gql +++ b/demo/api/schema.gql @@ -2,7 +2,7 @@ # THIS FILE WAS AUTOMATICALLY GENERATED (DO NOT MODIFY) # ------------------------------------------------------ -type User { +type UserPermissionsUser { id: String! name: String! email: String! @@ -26,7 +26,7 @@ type CurrentUser { email: String! permissions: [CurrentUserPermission!]! impersonated: Boolean - authenticatedUser: User + authenticatedUser: UserPermissionsUser permissionsForScope(scope: JSONObject!): [String!]! } @@ -169,12 +169,10 @@ type FileUpload { contentHash: String! createdAt: DateTime! updatedAt: DateTime! - downloadUrl: String - imageUrl(resizeWidth: Int!): String } -type PaginatedUserList { - nodes: [User!]! +type UserPermissionPaginatedUserList { + nodes: [UserPermissionsUser!]! totalCount: Int! } @@ -539,8 +537,8 @@ input EmailCampaignContentScopeInput { type Query { currentUser: CurrentUser! - userPermissionsUserById(id: String!): User! - userPermissionsUsers(offset: Int! = 0, limit: Int! = 25, search: String, filter: UserFilter, sort: [UserSort!]): PaginatedUserList! + userPermissionsUserById(id: String!): UserPermissionsUser! + userPermissionsUsers(offset: Int! = 0, limit: Int! = 25, search: String, filter: UserPermissionsUserFilter, sort: [UserPermissionsUserSort!]): UserPermissionPaginatedUserList! userPermissionsPermissionList(userId: String!): [UserPermission!]! userPermissionsPermission(id: ID!, userId: String): UserPermission! userPermissionsAvailablePermissions: [String!]! @@ -588,12 +586,12 @@ type Query { brevoConfig(scope: EmailCampaignContentScopeInput!): BrevoConfig } -input UserFilter { +input UserPermissionsUserFilter { name: StringFilter email: StringFilter status: StringFilter - and: [UserFilter!] - or: [UserFilter!] + and: [UserPermissionsUserFilter!] + or: [UserPermissionsUserFilter!] } input StringFilter { @@ -604,12 +602,12 @@ input StringFilter { notEqual: String } -input UserSort { - field: UserSortField! +input UserPermissionsUserSort { + field: UserPermissionsUserSortField! direction: SortDirection! = ASC } -enum UserSortField { +enum UserPermissionsUserSortField { name email status diff --git a/demo/api/src/comet-config.json b/demo/api/src/comet-config.json index 858a64e0..3705a7e4 100644 --- a/demo/api/src/comet-config.json +++ b/demo/api/src/comet-config.json @@ -5,7 +5,7 @@ }, "dam": { "uploadsMaxFileSize": 500, - "allowedImageSizes": [1200], + "allowedImageSizes": [320, 420, 768, 1024, 1200, 2048], "allowedImageAspectRatios": ["16x9", "4x3", "3x2", "3x1", "2x1", "1x1", "1x2", "1x3", "2x3", "3x4", "9x16"] }, "fileUploads": { diff --git a/demo/campaign/package.json b/demo/campaign/package.json index e6fd12a8..68e82911 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@comet/brevo-mail-rendering": "workspace:*", - "@comet/cms-site": "^7.7.0", + "@comet/cms-site": "^7.10.0", "@faire/mjml-react": "^3.4.0", "@luma-team/mjml-react": "^0.2.1", "@next/bundle-analyzer": "^12.3.4", @@ -49,8 +49,8 @@ }, "devDependencies": { "@babel/core": "^7.26.0", - "@comet/cli": "^7.7.0", - "@comet/eslint-config": "^7.7.0", + "@comet/cli": "^7.10.0", + "@comet/eslint-config": "^7.10.0", "@formatjs/cli": "^4.8.4", "@gitbeaker/node": "^35.8.1", "@graphql-codegen/add": "^3.2.3", diff --git a/demo/site/package.json b/demo/site/package.json index 0f361f88..62ecca77 100644 --- a/demo/site/package.json +++ b/demo/site/package.json @@ -25,7 +25,7 @@ "serve": "npm run extract:publicGenerated && NODE_ENV=production node server.js" }, "dependencies": { - "@comet/cms-site": "^7.7.0", + "@comet/cms-site": "^7.10.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.26.0", - "@comet/cli": "^7.7.0", - "@comet/eslint-config": "^7.7.0", + "@comet/cli": "^7.10.0", + "@comet/eslint-config": "^7.10.0", "@formatjs/cli": "^4.8.4", "@gitbeaker/node": "^35.8.1", "@graphql-codegen/add": "^3.2.3", diff --git a/install.sh b/install.sh index de3a1694..343043cf 100755 --- a/install.sh +++ b/install.sh @@ -53,5 +53,4 @@ sh ./demo/admin/intl-update.sh sh ./demo/site/intl-update.sh sh ./demo/campaign/intl-update.sh -mkdir -p ./demo/api/uploads - +mkdir -p ./demo/api/uploads \ No newline at end of file diff --git a/packages/admin/package.json b/packages/admin/package.json index dd5b69c8..bc71f58b 100644 --- a/packages/admin/package.json +++ b/packages/admin/package.json @@ -37,13 +37,13 @@ "@apollo/client": "^3.12.2", "@babel/cli": "^7.25.9", "@babel/core": "^7.26.0", - "@comet/admin": "^7.7.0", - "@comet/admin-babel-preset": "^7.7.0", - "@comet/admin-date-time": "^7.7.0", - "@comet/admin-icons": "^7.7.0", - "@comet/blocks-admin": "^7.7.0", - "@comet/cms-admin": "^7.7.0", - "@comet/eslint-config": "^7.7.0", + "@comet/admin": "^7.10.0", + "@comet/admin-babel-preset": "^7.10.0", + "@comet/admin-date-time": "^7.10.0", + "@comet/admin-icons": "^7.10.0", + "@comet/blocks-admin": "^7.10.0", + "@comet/cms-admin": "^7.10.0", + "@comet/eslint-config": "^7.10.0", "@emotion/react": "^11.9.3", "@emotion/styled": "^11.9.3", "@graphql-codegen/cli": "^2.16.5", @@ -75,11 +75,11 @@ }, "peerDependencies": { "@apollo/client": "^3.12.2", - "@comet/admin": "^7.7.0", - "@comet/admin-date-time": "^7.7.0", - "@comet/admin-icons": "^7.7.0", - "@comet/blocks-admin": "^7.7.0", - "@comet/cms-admin": "^7.7.0", + "@comet/admin": "^7.10.0", + "@comet/admin-date-time": "^7.10.0", + "@comet/admin-icons": "^7.10.0", + "@comet/blocks-admin": "^7.10.0", + "@comet/cms-admin": "^7.10.0", "@emotion/react": "^11.9.3", "@emotion/styled": "^11.9.3", "@mui/icons-material": "^5.16.8", diff --git a/packages/api/package.json b/packages/api/package.json index cc46cda7..f0c9841d 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -37,9 +37,9 @@ "node-fetch": "^2.7.0" }, "devDependencies": { - "@comet/blocks-api": "^7.7.0", - "@comet/cms-api": "^7.7.0", - "@comet/eslint-config": "^7.7.0", + "@comet/blocks-api": "^7.10.0", + "@comet/cms-api": "^7.10.0", + "@comet/eslint-config": "^7.10.0", "@kubernetes/client-node": "^0.18.0", "@mikro-orm/cli": "^5.9.8", "@mikro-orm/core": "^5.9.8", @@ -59,7 +59,7 @@ "@types/uuid": "^8.3.4", "chokidar-cli": "^2.1.0", "class-transformer": "^0.5.1", - "class-validator": "^0.14.1", + "class-validator": "^0.13.1", "eslint": "^8.0.0", "express": "^4.21.1", "graphql": "^15.9.0", @@ -77,8 +77,8 @@ "uuid": "^8.3.2" }, "peerDependencies": { - "@comet/blocks-api": "^7.7.0", - "@comet/cms-api": "^7.7.0", + "@comet/blocks-api": "^7.10.0", + "@comet/cms-api": "^7.10.0", "@mikro-orm/cli": "^5.9.8", "@mikro-orm/core": "^5.9.8", "@mikro-orm/migrations": "^5.9.8", diff --git a/packages/mail-rendering/package.json b/packages/mail-rendering/package.json index 7385647c..b81f53eb 100644 --- a/packages/mail-rendering/package.json +++ b/packages/mail-rendering/package.json @@ -23,25 +23,32 @@ "lint:prettier": "npx prettier --check './**/*.{js,json,md,yml,yaml}'", "lint:tsc": "tsc --noEmit" }, - "dependencies": { - "@comet/cli": "^7.7.0", - "@comet/cms-site": "^7.7.0" - }, "devDependencies": { - "@comet/eslint-config": "^7.7.0", + "@comet/cli": "^7.10.0", + "@comet/cms-site": "^7.10.0", + "@comet/eslint-config": "^7.10.0", + "@luma-team/mjml-react": "^0.2.1", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", "chokidar-cli": "^2.0.0", "eslint": "^8.0.0", + "mjml": "^4.15.3", + "next": "^14.2.18", "npm-run-all2": "^5.0.2", "react": "^18.3.1", "react-dom": "^18.3.1", "rimraf": "^6.0.1", + "styled-components": "^6.1.13", "typescript": "^4.9.5" }, "peerDependencies": { + "@comet/cms-site": "^7.10.0", + "@luma-team/mjml-react": "^0.2.1", + "mjml": "^4.7.0", + "next": "^14.2.18", "react": "^18.0.0", - "react-dom": "^18.0.0" + "react-dom": "^18.0.0", + "styled-components": "^6.1.13" }, "publishConfig": { "access": "public", diff --git a/packages/mail-rendering/src/blocks/CommonImageBlock.tsx b/packages/mail-rendering/src/blocks/CommonImageBlock.tsx new file mode 100644 index 00000000..9021563b --- /dev/null +++ b/packages/mail-rendering/src/blocks/CommonImageBlock.tsx @@ -0,0 +1,45 @@ +import { MjmlImage } from "@luma-team/mjml-react"; + +import { PixelImageBlockData } from "../blocks.generated"; +import { calculateInheritAspectRatio, generateImageUrl, getDamAllowedImageWidth } from "./helpers/imageBlockHelpers"; + +interface Props extends React.ComponentProps { + data: PixelImageBlockData; + desktopRenderWidth?: number; + contentWidth?: number; +} + +export const CommonImageBlock = ({ data, desktopRenderWidth = 600, contentWidth = 600, ...restProps }: Props) => { + const { damFile, cropArea, urlTemplate } = data; + + if (!damFile?.image) { + return null; + } + + const usedCropArea = cropArea ?? damFile.image.cropArea; + const usedAspectRatio = calculateInheritAspectRatio(damFile.image, usedCropArea); + + const imageUrl: string = generateImageUrl( + { + width: getDamAllowedImageWidth(desktopRenderWidth, contentWidth), + src: urlTemplate, + }, + usedAspectRatio, + ); + + const desktopImageHeight = Math.round(desktopRenderWidth / usedAspectRatio); + + return ( + + ); +}; diff --git a/packages/mail-rendering/src/blocks/NewsletterImageBlock.tsx b/packages/mail-rendering/src/blocks/NewsletterImageBlock.tsx index 97067d0a..cafba375 100644 --- a/packages/mail-rendering/src/blocks/NewsletterImageBlock.tsx +++ b/packages/mail-rendering/src/blocks/NewsletterImageBlock.tsx @@ -1,7 +1,20 @@ import { PropsWithData } from "@comet/cms-site"; +import { MjmlColumn, MjmlSection } from "@luma-team/mjml-react"; import { NewsletterImageBlockData } from "../blocks.generated"; +import { CommonImageBlock } from "./CommonImageBlock"; -export const NewsletterImageBlock = ({ data }: PropsWithData) => { - return null; +interface NewsletterImageBlockProps extends PropsWithData { + desktopRenderWidth?: number; + contentWidth?: number; +} + +export const NewsletterImageBlock = ({ data, desktopRenderWidth, contentWidth }: NewsletterImageBlockProps) => { + return ( + + + + + + ); }; diff --git a/packages/mail-rendering/src/blocks/helpers/imageBlockHelpers.ts b/packages/mail-rendering/src/blocks/helpers/imageBlockHelpers.ts new file mode 100644 index 00000000..434c0340 --- /dev/null +++ b/packages/mail-rendering/src/blocks/helpers/imageBlockHelpers.ts @@ -0,0 +1,55 @@ +import { ImageLoaderProps } from "next/image"; + +export const validSizes: number[] = (process.env.DAM_ALLOWED_IMAGE_SIZES as string) + .split(",") + .map((value) => parseInt(value)) + .sort((a, b) => a - b); + +export const getDamAllowedImageWidth = (minimumWidth: number, contentWidth: number): number => { + let width: number | null = null; + const largestPossibleWidth = validSizes[validSizes.length - 1]; + + validSizes.forEach((validWidth) => { + if (minimumWidth === contentWidth) { + width = contentWidth * 2; + } else if (!width && validWidth >= minimumWidth * 2) { + width = validWidth; + } + }); + + if (!width) { + return largestPossibleWidth; + } + + return width; +}; + +interface ImageDimensions { + width: number; + height: number; +} + +export function calculateInheritAspectRatio( + imageDimensions: ImageDimensions, + cropArea: { + focalPoint: "SMART" | "CENTER" | "NORTHWEST" | "NORTHEAST" | "SOUTHWEST" | "SOUTHEAST"; + width?: number; + height?: number; + x?: number; + y?: number; + }, +): number { + if (cropArea.focalPoint === "SMART") { + return imageDimensions.width / imageDimensions.height; + } else { + if (cropArea.width === undefined || cropArea.height === undefined) { + throw new Error("Missing crop dimensions"); + } + + return (cropArea.width * imageDimensions.width) / 100 / ((cropArea.height * imageDimensions.height) / 100); + } +} + +export function generateImageUrl({ src, width }: Pick, aspectRatio: number): string { + return src.replace("$resizeWidth", String(width)).replace("$resizeHeight", String(Math.ceil(width / aspectRatio))); +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index abba0fb3..360fe22a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -56,26 +56,26 @@ importers: specifier: ^7.26.0 version: 7.26.0 '@comet/admin': - specifier: ^7.7.0 - version: 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.10.0 + version: 7.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0 - version: 7.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) + specifier: ^7.10.0 + version: 7.10.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@comet/admin-rte': - specifier: ^7.7.0 - version: 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.9.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.10.0 + version: 7.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.9.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.7.0 - version: 7.7.0(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) + specifier: ^7.10.0 + version: 7.10.0(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@comet/blocks-admin': - specifier: ^7.7.0 - version: 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.10.0 + version: 7.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0 - version: 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.9.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.10.0 + version: 7.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.9.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) @@ -159,11 +159,11 @@ importers: version: 5.3.4(react@17.0.2) devDependencies: '@comet/cli': - specifier: ^7.7.0 - version: 7.7.0(ts-node@10.9.2) + specifier: ^7.10.0 + version: 7.10.0(ts-node@10.9.2) '@comet/eslint-config': - specifier: ^7.7.0 - version: 7.7.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5) + specifier: ^7.10.0 + version: 7.10.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5) '@emotion/babel-plugin': specifier: ^11.0.0 version: 11.11.0 @@ -273,14 +273,14 @@ importers: demo/api: dependencies: '@comet/blocks-api': - specifier: ^7.7.0 - version: 7.7.0(@nestjs/common@9.4.3) + specifier: ^7.10.0 + version: 7.10.0(@nestjs/common@9.4.3)(class-validator@0.13.2) '@comet/brevo-api': specifier: workspace:* version: link:../../packages/api '@comet/cms-api': - specifier: ^7.7.0 - version: 7.7.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.21.1)(graphql@15.9.0)(nestjs-console@8.0.0)(rxjs@7.8.1) + specifier: ^7.10.0 + version: 7.10.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)(class-validator@0.13.2)(express@4.21.1)(graphql@15.9.0)(nestjs-console@8.0.0)(rxjs@7.8.1) '@faker-js/faker': specifier: ^8.4.1 version: 8.4.1 @@ -310,7 +310,7 @@ importers: 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.9.0) '@nestjs/common': specifier: ^9.4.3 - version: 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + version: 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.13.2)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/config': specifier: ^2.3.4 version: 2.3.4(@nestjs/common@9.4.3)(reflect-metadata@0.1.14)(rxjs@7.8.1) @@ -319,7 +319,7 @@ importers: version: 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': specifier: ^10.2.1 - version: 10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(graphql@15.9.0)(reflect-metadata@0.1.14) + version: 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.9.0)(reflect-metadata@0.1.14) '@nestjs/passport': specifier: ^9.0.3 version: 9.0.3(@nestjs/common@9.4.3)(passport@0.6.0) @@ -348,8 +348,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 class-validator: - specifier: ^0.14.1 - version: 0.14.1 + specifier: ^0.13.2 + version: 0.13.2 cli-progress: specifier: ^3.12.0 version: 3.12.0 @@ -415,8 +415,8 @@ importers: version: 5.94.0(webpack-cli@4.10.0) devDependencies: '@comet/eslint-config': - specifier: ^7.7.0 - version: 7.7.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@27.1.5)(typescript@4.9.5) + specifier: ^7.10.0 + version: 7.10.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@27.1.5)(typescript@4.9.5) '@nestjs/cli': specifier: ^9.5.0 version: 9.5.0 @@ -487,8 +487,8 @@ importers: specifier: workspace:* version: link:../../packages/mail-rendering '@comet/cms-site': - specifier: ^7.7.0 - version: 7.7.0(@types/react@18.3.12)(next@14.2.18)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) + specifier: ^7.10.0 + version: 7.10.0(@types/react@18.3.12)(next@14.2.18)(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) @@ -569,11 +569,11 @@ importers: specifier: ^7.26.0 version: 7.26.0 '@comet/cli': - specifier: ^7.7.0 - version: 7.7.0(ts-node@10.9.2) + specifier: ^7.10.0 + version: 7.10.0(ts-node@10.9.2) '@comet/eslint-config': - specifier: ^7.7.0 - version: 7.7.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5) + specifier: ^7.10.0 + version: 7.10.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5) '@formatjs/cli': specifier: ^4.8.4 version: 4.8.4 @@ -644,8 +644,8 @@ importers: demo/site: dependencies: '@comet/cms-site': - specifier: ^7.7.0 - version: 7.7.0(@types/react@18.3.12)(next@14.2.18)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) + specifier: ^7.10.0 + version: 7.10.0(@types/react@18.3.12)(next@14.2.18)(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 @@ -711,11 +711,11 @@ importers: specifier: ^7.26.0 version: 7.26.0 '@comet/cli': - specifier: ^7.7.0 - version: 7.7.0(ts-node@10.9.2) + specifier: ^7.10.0 + version: 7.10.0(ts-node@10.9.2) '@comet/eslint-config': - specifier: ^7.7.0 - version: 7.7.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5) + specifier: ^7.10.0 + version: 7.10.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5) '@formatjs/cli': specifier: ^4.8.4 version: 4.8.4 @@ -808,26 +808,26 @@ importers: specifier: ^7.26.0 version: 7.26.0 '@comet/admin': - specifier: ^7.7.0 - version: 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.10.0 + version: 7.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0 - version: 7.7.0(@babel/cli@7.25.9) + specifier: ^7.10.0 + version: 7.10.0(@babel/cli@7.25.9) '@comet/admin-date-time': - specifier: ^7.7.0 - version: 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.10.0 + version: 7.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0 - version: 7.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) + specifier: ^7.10.0 + version: 7.10.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@comet/blocks-admin': - specifier: ^7.7.0 - version: 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.10.0 + version: 7.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0 - version: 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.9.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.10.0 + version: 7.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.9.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.7.0 - version: 7.7.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5) + specifier: ^7.10.0 + version: 7.10.0(eslint@8.56.0)(next@14.2.18)(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) @@ -938,14 +938,14 @@ importers: version: 2.7.0 devDependencies: '@comet/blocks-api': - specifier: ^7.7.0 - version: 7.7.0(@nestjs/common@9.4.3) + specifier: ^7.10.0 + version: 7.10.0(@nestjs/common@9.4.3)(class-validator@0.13.2) '@comet/cms-api': - specifier: ^7.7.0 - version: 7.7.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.21.1)(graphql@15.9.0)(nestjs-console@8.0.0)(rxjs@7.8.1) + specifier: ^7.10.0 + version: 7.10.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)(class-validator@0.13.2)(express@4.21.1)(graphql@15.9.0)(nestjs-console@8.0.0)(rxjs@7.8.1) '@comet/eslint-config': - specifier: ^7.7.0 - version: 7.7.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@29.1.1)(typescript@4.9.5) + specifier: ^7.10.0 + version: 7.10.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 @@ -966,13 +966,13 @@ importers: version: 5.9.8(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8) '@nestjs/common': specifier: ^9.4.3 - version: 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + version: 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.13.2)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/core': specifier: ^9.4.3 version: 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': specifier: ^10.2.1 - version: 10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(graphql@15.9.0)(reflect-metadata@0.1.14) + version: 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.9.0)(reflect-metadata@0.1.14) '@nestjs/platform-express': specifier: ^9.4.3 version: 9.4.3(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) @@ -1004,8 +1004,8 @@ importers: specifier: ^0.5.1 version: 0.5.1 class-validator: - specifier: ^0.14.1 - version: 0.14.1 + specifier: ^0.13.1 + version: 0.13.2 eslint: specifier: ^8.0.0 version: 8.56.0 @@ -1053,17 +1053,19 @@ importers: version: 8.3.2 packages/mail-rendering: - dependencies: + devDependencies: '@comet/cli': - specifier: ^7.7.0 - version: 7.7.0(ts-node@10.9.2) + specifier: ^7.10.0 + version: 7.10.0(ts-node@10.9.2) '@comet/cms-site': - specifier: ^7.7.0 - version: 7.7.0(@types/react@18.3.12)(next@14.2.18)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) - devDependencies: + specifier: ^7.10.0 + version: 7.10.0(@types/react@18.3.12)(next@14.2.18)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13) '@comet/eslint-config': - specifier: ^7.7.0 - version: 7.7.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5) + specifier: ^7.10.0 + version: 7.10.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5) + '@luma-team/mjml-react': + specifier: ^0.2.1 + version: 0.2.1(react-dom@18.3.1)(react@18.3.1) '@types/react': specifier: ^18.3.12 version: 18.3.12 @@ -1076,6 +1078,12 @@ importers: eslint: specifier: ^8.0.0 version: 8.56.0 + mjml: + specifier: ^4.15.3 + version: 4.15.3 + next: + specifier: ^14.2.18 + version: 14.2.18(@babel/core@7.26.0)(@opentelemetry/api@1.7.0)(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) npm-run-all2: specifier: ^5.0.2 version: 5.0.2 @@ -1088,6 +1096,9 @@ importers: rimraf: specifier: ^6.0.1 version: 6.0.1 + styled-components: + specifier: ^6.1.13 + version: 6.1.13(@types/react@18.3.12)(react-dom@18.3.1)(react@18.3.1) typescript: specifier: ^4.9.5 version: 4.9.5 @@ -3858,8 +3869,8 @@ packages: dev: true optional: true - /@comet/admin-babel-preset@7.7.0(@babel/cli@7.25.9): - resolution: {integrity: sha512-rap123hBI/Q3Q65S3kMpQw9CJOppoCUwYM7/6CJsvxkFFybpOpOnFgjAudUYKw8FBXiq6bsNqkQhlqhuOO1L0g==} + /@comet/admin-babel-preset@7.10.0(@babel/cli@7.25.9): + resolution: {integrity: sha512-Lvy0BkRz2/By73CNjQQ2C9nHfZyfhjf9+rGQBzVG1yl7uUKprSk2dN8vwRxjF/YXRiyAWmAWIpBKIhK3rIQ73Q==} peerDependencies: '@babel/cli': '>= 7' dependencies: @@ -3874,8 +3885,8 @@ packages: - supports-color dev: true - /@comet/admin-date-time@7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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-btbHQFz4Suwiur4dn9eXljY+zD/0B2xTeGnECpnixVrCCRqzflmFmPMDSVZjXv4j/npoBTEcKPhgShozvP7myQ==} + /@comet/admin-date-time@7.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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-FuGay0bYlANQmHn0uiHC9r7AtauJ3aJ7vg50tSucXD2Bgi6zUj7pNe0ATOmUUy4sS+mUosppvg98goRKDn7fdg==} peerDependencies: '@mui/material': ^5.0.0 react: ^17.0 @@ -3883,10 +3894,10 @@ packages: react-final-form: ^6.5.7 react-intl: ^5.0.0 || ^6.0.0 dependencies: - '@comet/admin': 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin': 7.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.10.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.16.7(@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) + '@mui/utils': 5.16.6(@types/react@17.0.75)(react@17.0.2) clsx: 1.2.1 date-fns: 2.30.0 react: 17.0.2 @@ -3910,8 +3921,8 @@ packages: - react-router - react-router-dom - /@comet/admin-icons@7.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2): - resolution: {integrity: sha512-91zniX6PDnesOWe/1E9BpO3XlewqtNcsoDeaPE1IgpkIjlsio/gBBniWgEHTxq7xovMxIi2mlDnTX9+c8VW+cQ==} + /@comet/admin-icons@7.10.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2): + resolution: {integrity: sha512-hcWTZt2gKjv8G2KqsBNHBg85kdi+vDv6pPPtkRCyY3y48t8sg+LuEbXpKGVFrpce+qi9gWR2zbnrmv596oa6vg==} peerDependencies: '@mui/material': ^5.0.0 react: ^17.0 @@ -3923,8 +3934,8 @@ packages: use-constant: 1.1.1(react@17.0.2) uuid: 9.0.1 - /@comet/admin-rte@7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.9.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-ic6Xu/J6YUcz6DgO6J/AKMCxLLjjBS3cteVSuQMKMMkxMiAezoUhGtFUvLd1GH/ST57aE4wwB4pdPVItWTgaig==} + /@comet/admin-rte@7.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.9.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-S0n9YILRxWvLLDKJ8kNuYLx0fXMWjEl8ymccwaaz9l6nuQBL6nbmNsAHVE7i5TFUwPXgKay5DFF/8L6Fw20WXg==} peerDependencies: '@mui/material': ^5.0.0 draft-js: ^0.11.4 @@ -3934,8 +3945,8 @@ packages: react-final-form: ^6.3.1 react-intl: ^5.0.0 || ^6.0.0 dependencies: - '@comet/admin': 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin': 7.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.10.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.16.7(@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) @@ -3963,24 +3974,24 @@ packages: - react-router - react-router-dom - /@comet/admin-theme@7.7.0(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2): - resolution: {integrity: sha512-lLnie286ww2eOtKonOKloTR2BvJN9AD7Qk8/HtpaYYJmrlZrvNWSkBJ0VF0EY99mTq8vnz8Rt4oxq8e3otyusw==} + /@comet/admin-theme@7.10.0(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2): + resolution: {integrity: sha512-HMLWGU2TgAQ0zesR7lz83IPs/G7Y8Jgtkp4HHlJEZxj5TxGoZuX6vhhe5eDV4Hc3KrN0EcDzAm+QZhwNGmg/EQ==} peerDependencies: '@mui/material': ^5.0.0 '@mui/system': ^5.0.0 react: ^17.0 dependencies: - '@comet/admin-icons': 7.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin-icons': 7.10.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.16.7(@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.16.7(@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) + '@mui/utils': 5.16.6(@types/react@17.0.75)(react@17.0.2) react: 17.0.2 transitivePeerDependencies: - '@types/react' - react-dom - /@comet/admin@7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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-CXw8EgFjbRaIUdEKdBjbSOHY4GyTxqqe4ZxSyvgwosrpG6t0eD/4sknvSEwQMSPVl3FsJzeuoQkDj8yX0f/YDQ==} + /@comet/admin@7.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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-TDZuf3Yh/NOiT3637MYy5iMXoypHtmW2UYOZr5IU+i8lua3T40y2ikSiznRlg1q42woMel5NdiL5PVPQYdE9Ow==} peerDependencies: '@apollo/client': ^3.7.0 '@emotion/react': ^11.5.0 @@ -4008,15 +4019,14 @@ packages: optional: true dependencies: '@apollo/client': 3.12.2(@types/react@17.0.75)(graphql@15.9.0)(react-dom@17.0.2)(react@17.0.2) - '@comet/admin-icons': 7.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) - '@comet/admin-theme': 7.7.0(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin-icons': 7.10.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin-theme': 7.10.0(@mui/material@5.16.7)(@mui/system@5.16.7)(@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.173(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.16.7(@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/private-theming': 5.16.6(@types/react@17.0.75)(react@17.0.2) '@mui/x-data-grid': 5.17.26(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) - '@types/react': 17.0.75 clsx: 1.2.1 exceljs: 3.10.0 file-saver: 2.0.5 @@ -4032,7 +4042,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-dropzone: 14.3.5(react@17.0.2) react-final-form: 6.5.9(final-form@4.20.10)(react@17.0.2) 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) @@ -4043,8 +4053,8 @@ packages: - '@mui/system' - '@types/react' - /@comet/blocks-admin@7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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-J2IJccacYuiJSehTEfeV4hKTTQtl8HvPF8+BwFAItxNirTBi5arSb73Gcg3W2bawi1mf0uHtFE39SMK+Kn+58g==} + /@comet/blocks-admin@7.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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-iK9wbBVO8sTUYY15Uq7vZ+jAQyrbaiW3qtWxPcp03c6B2Gm3fN9eebF5yOnagf8a7ESQIjVpVgwJqP7KPPeQTw==} peerDependencies: '@mui/material': ^5.0.0 react: ^16.8.0 || ^17.0.0 @@ -4055,8 +4065,8 @@ packages: react-router: ^5.0.0 react-router-dom: ^5.0.0 dependencies: - '@comet/admin': 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin': 7.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.10.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) '@mui/lab': 5.0.0-alpha.173(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) '@mui/material': 5.16.7(@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 @@ -4085,18 +4095,19 @@ packages: - graphql - history - /@comet/blocks-api@7.7.0(@nestjs/common@9.4.3): - resolution: {integrity: sha512-wZRVs/8gjvum5dznLrw2iA+/FpPzGO0H3yg5vipNwTokSdAI62WLXB41BopNA7fAx/6FsGHzSeWd/wMQzgI9tg==} + /@comet/blocks-api@7.10.0(@nestjs/common@9.4.3)(class-validator@0.13.2): + resolution: {integrity: sha512-hG4Z/Dplx2ltgECz75nUIVg46OgVi77fSxR8oxNfdwTmVlGJQUVOKpt6oPNx4/0QF27j8zAeSS8pU9WeMpskRQ==} peerDependencies: '@nestjs/common': ^9.0.0 + class-validator: ^0.11.1 || ^0.12.0 || ^0.13.0 dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.13.2)(reflect-metadata@0.1.14)(rxjs@7.8.1) class-transformer: 0.5.1 class-validator: 0.13.2 rimraf: 3.0.2 - /@comet/cli@7.7.0(ts-node@10.9.2): - resolution: {integrity: sha512-q29q72cclYIEFpZsFS5uAQHUKHXdN+kJwCVuOnfIgpDSVkEcE4BxsZdL1Kb/OmddiXqAlNhWeEUmXXpHCURXtQ==} + /@comet/cli@7.10.0(ts-node@10.9.2): + resolution: {integrity: sha512-P9LDFrUN/U5vH2/3L3Z9QB6DfYzTSmc8XHn5daNaMLXSdYgXyKkDchlegnxwXATQiFmkV1ktUG6L9Jtt9Db+3g==} hasBin: true peerDependencies: ts-node: ^10.9.1 @@ -4104,9 +4115,10 @@ packages: 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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.9.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-FARsHyD2+c6ba1yObRG4yosJ7eJPT1Tnx6vLrdriCcsy6T5rGZLr1oJKT5rNKkb/Yw+SbNXrqEvIes+8jpBVHw==} + /@comet/cms-admin@7.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.9.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-K5CUfDBatS8vulGmo6c21FOGlbwspQ2gv0J/yTa2V5iNSitJO+gskeIe4FHaO9TroNh1xoG5AA4mmBzg5hNXvg==} hasBin: true peerDependencies: '@apollo/client': ^3.7.0 @@ -4126,12 +4138,12 @@ packages: react-router-dom: ^5.0.0 dependencies: '@apollo/client': 3.12.2(@types/react@17.0.75)(graphql@15.9.0)(react-dom@17.0.2)(react@17.0.2) - '@comet/admin': 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.7.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) - '@comet/admin-rte': 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.9.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.7.0(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) - '@comet/blocks-admin': 7.7.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.10.0(@mui/material@5.16.7)(react-dom@17.0.2)(react@17.0.2) + '@comet/admin-rte': 7.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(draft-js@0.11.7)(final-form@4.20.10)(graphql@15.9.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.10.0(@mui/material@5.16.7)(@mui/system@5.16.7)(@types/react@17.0.75)(react-dom@17.0.2)(react@17.0.2) + '@comet/blocks-admin': 7.10.0(@apollo/client@3.12.2)(@emotion/react@11.11.3)(@emotion/styled@11.11.0)(@mui/material@5.16.7)(@mui/system@5.16.7)(@mui/x-data-grid@5.17.26)(@types/react@17.0.75)(final-form@4.20.10)(graphql@15.9.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.9.0) @@ -4142,7 +4154,7 @@ packages: '@mui/x-data-grid': 5.17.26(@mui/material@5.16.7)(@mui/system@5.16.7)(@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 + class-validator: 0.14.1 clsx: 1.2.1 commander: 10.0.1 date-fns: 2.30.0 @@ -4150,6 +4162,7 @@ packages: final-form: 4.20.10 final-form-arrays: 3.1.0(final-form@4.20.10) final-form-set-field-touched: 1.0.1(final-form@4.20.10) + glob: 10.3.15 graphql: 15.9.0 graphql-tag: 2.12.6(graphql@15.9.0) js-cookie: 3.0.5 @@ -4193,8 +4206,8 @@ packages: - draft-js - history - /@comet/cms-api@7.7.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.21.1)(graphql@15.9.0)(nestjs-console@8.0.0)(rxjs@7.8.1): - resolution: {integrity: sha512-Sx92DWQuZmGcYbh147FF+TTW+mO6M115rDez70mEPJFHWaKbjcJGyzxJht048TsBLmnpSL9wBBg31ILKVogl+w==} + /@comet/cms-api@7.10.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)(class-validator@0.13.2)(express@4.21.1)(graphql@15.9.0)(nestjs-console@8.0.0)(rxjs@7.8.1): + resolution: {integrity: sha512-Osoyh0AnxavSiNCcUr+FvUrLljq7lIoCze28HAYM0+QHNGc5bdA4VWr81/ZfryklnFr9OjsqvM375tIKFmfDbw==} hasBin: true peerDependencies: '@kubernetes/client-node': '>=0.18.0' @@ -4207,6 +4220,7 @@ packages: '@nestjs/graphql': ^10.0.0 '@nestjs/platform-express': ^9.0.0 '@sentry/node': ^7.0.0 + class-validator: ^0.11.1 || ^0.12.0 || ^0.13.0 express: ^4.0.0 graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 nestjs-console: ^8.0.0 @@ -4219,7 +4233,7 @@ packages: '@azure-rest/ai-translation-text': 1.0.0 '@azure/openai': 1.0.0-beta.11 '@azure/storage-blob': 12.25.0 - '@comet/blocks-api': 7.7.0(@nestjs/common@9.4.3) + '@comet/blocks-api': 7.10.0(@nestjs/common@9.4.3)(class-validator@0.13.2) '@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 @@ -4228,9 +4242,9 @@ packages: '@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.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(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.14.1)(graphql@15.9.0)(reflect-metadata@0.1.14) + '@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.9.0)(reflect-metadata@0.1.14) '@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) @@ -4284,8 +4298,8 @@ packages: - encoding - supports-color - /@comet/cms-site@7.7.0(@types/react@18.3.12)(next@14.2.18)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13): - resolution: {integrity: sha512-wIdqXU/hLRiuNukO2ad9luhfdZHAcMk4hc/G3V8oqZI+cdEC3gYfw0dUzslb63YhNxqYRcF3/roaRWEZ+GC9Qw==} + /@comet/cms-site@7.10.0(@types/react@18.3.12)(next@14.2.18)(react-dom@18.3.1)(react@18.3.1)(styled-components@6.1.13): + resolution: {integrity: sha512-BmsT+ft4yRMdxRleTh1aiB6TT0/4uwmIl0x9AuPT5JhbPSjHleH8zb+qPzCYfPyQLiJVE6DJ8rY4PODypHBycw==} peerDependencies: '@types/react': ^18.0.0 next: ^14.2.0 @@ -4302,9 +4316,7 @@ packages: scroll-into-view-if-needed: 2.2.31 server-only: 0.0.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 /@comet/dev-process-manager@2.7.0: resolution: {integrity: sha512-BtCOF687GO1ccwm7ecHfIV57glnLSG+OsReEolomZJe3OeToMWjUpMyfJ+/5zm2m5EpzePA+kABhbIZk/Va90g==} @@ -4325,8 +4337,8 @@ packages: - debug dev: true - /@comet/eslint-config@7.7.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5): - resolution: {integrity: sha512-Ou7zHQdueJ8mQdwsGvQAYdMvzqnQ6guzZnWR69EFGbO2KN2WTm7EuLmaCvlDjZhfM89k6g1fX5MG12gFzDAIgg==} + /@comet/eslint-config@7.10.0(eslint@8.56.0)(next@14.2.18)(prettier@2.8.8)(typescript@4.9.5): + resolution: {integrity: sha512-xZ1tdRpE6tQH627+bFD5Pt9Fgib5mwSot0boHueiyWpSwvM81bdsSac0fN1x6MWgeAOgysThdo9lFvd4AwCQ2A==} peerDependencies: eslint: '>= 8' next: '*' @@ -4336,7 +4348,7 @@ packages: optional: true dependencies: '@calm/eslint-plugin-react-intl': 1.4.1 - '@comet/eslint-plugin': 7.7.0(eslint@8.56.0) + '@comet/eslint-plugin': 7.10.0(eslint@8.56.0) '@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) @@ -4363,8 +4375,8 @@ packages: - typescript dev: true - /@comet/eslint-config@7.7.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@27.1.5)(typescript@4.9.5): - resolution: {integrity: sha512-Ou7zHQdueJ8mQdwsGvQAYdMvzqnQ6guzZnWR69EFGbO2KN2WTm7EuLmaCvlDjZhfM89k6g1fX5MG12gFzDAIgg==} + /@comet/eslint-config@7.10.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@27.1.5)(typescript@4.9.5): + resolution: {integrity: sha512-xZ1tdRpE6tQH627+bFD5Pt9Fgib5mwSot0boHueiyWpSwvM81bdsSac0fN1x6MWgeAOgysThdo9lFvd4AwCQ2A==} peerDependencies: eslint: '>= 8' next: '*' @@ -4374,7 +4386,7 @@ packages: optional: true dependencies: '@calm/eslint-plugin-react-intl': 1.4.1 - '@comet/eslint-plugin': 7.7.0(eslint@8.56.0) + '@comet/eslint-plugin': 7.10.0(eslint@8.56.0) '@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) @@ -4400,8 +4412,8 @@ packages: - typescript dev: true - /@comet/eslint-config@7.7.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@29.1.1)(typescript@4.9.5): - resolution: {integrity: sha512-Ou7zHQdueJ8mQdwsGvQAYdMvzqnQ6guzZnWR69EFGbO2KN2WTm7EuLmaCvlDjZhfM89k6g1fX5MG12gFzDAIgg==} + /@comet/eslint-config@7.10.0(eslint@8.56.0)(prettier@2.8.8)(ts-jest@29.1.1)(typescript@4.9.5): + resolution: {integrity: sha512-xZ1tdRpE6tQH627+bFD5Pt9Fgib5mwSot0boHueiyWpSwvM81bdsSac0fN1x6MWgeAOgysThdo9lFvd4AwCQ2A==} peerDependencies: eslint: '>= 8' next: '*' @@ -4411,7 +4423,7 @@ packages: optional: true dependencies: '@calm/eslint-plugin-react-intl': 1.4.1 - '@comet/eslint-plugin': 7.7.0(eslint@8.56.0) + '@comet/eslint-plugin': 7.10.0(eslint@8.56.0) '@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) @@ -4437,8 +4449,8 @@ packages: - typescript dev: true - /@comet/eslint-plugin@7.7.0(eslint@8.56.0): - resolution: {integrity: sha512-4DWcx2ZyTxQzB9uwt0prX+fZKwSZSAeolcPajKtsozpjo5wbMM+HfTWVJWq5d0ODGs6alCWAE5Y/3zpMieUHdQ==} + /@comet/eslint-plugin@7.10.0(eslint@8.56.0): + resolution: {integrity: sha512-9NlXdx0yyLEn4e1I074Txi5hEr7Y3Oj92mrhoBkQcBeReBiKwNBoxPUgSsVMpQSCjIw9f2CaMzigQ+VLoo+8jQ==} peerDependencies: eslint: '8' dependencies: @@ -4491,7 +4503,6 @@ packages: 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==} @@ -4933,7 +4944,7 @@ packages: '@nestjs/common': ^9.x '@nestjs/core': ^9.x dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(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) lodash: 4.17.21 @@ -6259,7 +6270,6 @@ packages: color: 3.2.1 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - dev: false /@manypkg/find-root@1.1.0: resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} @@ -6457,7 +6467,7 @@ packages: '@nestjs/core': ^8.0.0 || ^9.0.0 || ^10.0.0 dependencies: '@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.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(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.8(@mikro-orm/core@5.9.8)(@mikro-orm/migrations@5.9.8): @@ -6599,22 +6609,6 @@ packages: react-is: 18.3.1 react-transition-group: 4.4.5(react-dom@17.0.2)(react@17.0.2) - /@mui/private-theming@5.15.5(@types/react@17.0.75)(react@17.0.2): - resolution: {integrity: sha512-HU1KCyGNcJFsUamTbOM539ZDZJNI/XU7sZFdsN29glktUf+T6hNvDuO2ISinBiLTZy7Ab3R6DSSoYXRrLc4uwQ==} - engines: {node: '>=12.0.0'} - peerDependencies: - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - dependencies: - '@babel/runtime': 7.24.5 - '@mui/utils': 5.15.5(@types/react@17.0.75)(react@17.0.2) - '@types/react': 17.0.75 - prop-types: 15.8.1 - react: 17.0.2 - /@mui/private-theming@5.16.6(@types/react@17.0.75)(react@17.0.2): resolution: {integrity: sha512-rAk+Rh8Clg7Cd7shZhyt2HGTTE5wYKNSJ5sspf28Fqm/PZ69Er9o6KX25g03/FG2dfpg5GCwZh/xOojiTfm3hw==} engines: {node: '>=12.0.0'} @@ -6772,9 +6766,9 @@ packages: apollo-server-fastify: optional: true dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(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.14.1)(graphql@15.9.0)(reflect-metadata@0.1.14) + '@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.9.0)(reflect-metadata@0.1.14) apollo-server-core: 3.13.0(graphql@15.9.0) apollo-server-express: 3.13.0(express@4.21.1)(graphql@15.9.0) graphql: 15.9.0 @@ -6790,7 +6784,7 @@ packages: reflect-metadata: ^0.1.12 rxjs: ^6.0.0 || ^7.0.0 dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.13.2)(reflect-metadata@0.1.14)(rxjs@7.8.1) axios: 1.2.1 reflect-metadata: 0.1.14 rxjs: 7.8.1 @@ -6806,7 +6800,7 @@ packages: cache-manager: <=5 rxjs: ^7.0.0 dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(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) cache-manager: 5.7.6 rxjs: 7.8.1 @@ -6846,7 +6840,7 @@ packages: - webpack-cli dev: true - /@nestjs/common@9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1): + /@nestjs/common@9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.13.2)(reflect-metadata@0.1.14)(rxjs@7.8.1): resolution: {integrity: sha512-Gd6D4IaYj01o14Bwv81ukidn4w3bPHCblMUq+SmUmWLyosK+XQmInCS09SbDDZyL8jy86PngtBLTdhJ2bXSUig==} peerDependencies: cache-manager: <=5 @@ -6864,7 +6858,7 @@ packages: dependencies: cache-manager: 5.7.6 class-transformer: 0.5.1 - class-validator: 0.14.1 + class-validator: 0.13.2 iterare: 1.2.1 reflect-metadata: 0.1.14 rxjs: 7.8.1 @@ -6878,7 +6872,7 @@ packages: reflect-metadata: ^0.1.13 rxjs: ^6.0.0 || ^7.2.0 dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.13.2)(reflect-metadata@0.1.14)(rxjs@7.8.1) dotenv: 16.1.4 dotenv-expand: 10.0.0 lodash: 4.17.21 @@ -6905,7 +6899,7 @@ packages: '@nestjs/websockets': optional: true dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.13.2)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@nestjs/platform-express': 9.4.3(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) '@nuxtjs/opencollective': 0.3.2 fast-safe-stringify: 2.1.1 @@ -6918,7 +6912,7 @@ packages: transitivePeerDependencies: - encoding - /@nestjs/graphql@10.2.1(@nestjs/common@9.4.3)(@nestjs/core@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(graphql@15.9.0)(reflect-metadata@0.1.14): + /@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.9.0)(reflect-metadata@0.1.14): resolution: {integrity: sha512-FBzYTymT4oopiGMpej7GTRyhz1BgJxLlXZPUueamC5J9u1WxCwJyETkzBI/zeUkUydlklF/xd5zDd/Md6//hEw==} peerDependencies: '@apollo/subgraph': ^0.1.5 || ^0.3.0 || ^0.4.0 || ^2.0.0 @@ -6942,12 +6936,12 @@ packages: '@graphql-tools/merge': 8.3.18(graphql@15.9.0) '@graphql-tools/schema': 9.0.16(graphql@15.9.0) '@graphql-tools/utils': 9.2.1(graphql@15.9.0) - '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(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/mapped-types': 1.2.2(@nestjs/common@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14) + '@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) chokidar: 3.5.3 class-transformer: 0.5.1 - class-validator: 0.14.1 + class-validator: 0.13.2 fast-glob: 3.2.12 graphql: 15.9.0 graphql-tag: 2.12.6(graphql@15.9.0) @@ -6968,7 +6962,7 @@ packages: peerDependencies: '@nestjs/common': ^8.0.0 || ^9.0.0 dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.13.2)(reflect-metadata@0.1.14)(rxjs@7.8.1) '@types/jsonwebtoken': 8.5.8 jsonwebtoken: 8.5.1 @@ -6985,36 +6979,18 @@ packages: class-validator: optional: true dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.13.2)(reflect-metadata@0.1.14)(rxjs@7.8.1) class-transformer: 0.5.1 class-validator: 0.13.2 reflect-metadata: 0.1.14 - /@nestjs/mapped-types@1.2.2(@nestjs/common@9.4.3)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14): - resolution: {integrity: sha512-3dHxLXs3M0GPiriAcCFFJQHoDFUuzTD5w6JDhE7TyfT89YKpe6tcCCIqOZWdXmt9AZjjK30RkHRSFF+QEnWFQg==} - peerDependencies: - '@nestjs/common': ^7.0.8 || ^8.0.0 || ^9.0.0 - class-transformer: ^0.2.0 || ^0.3.0 || ^0.4.0 || ^0.5.0 - class-validator: ^0.11.1 || ^0.12.0 || ^0.13.0 || ^0.14.0 - reflect-metadata: ^0.1.12 - peerDependenciesMeta: - class-transformer: - optional: true - class-validator: - optional: true - dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) - class-transformer: 0.5.1 - class-validator: 0.14.1 - reflect-metadata: 0.1.14 - /@nestjs/passport@9.0.3(@nestjs/common@9.4.3)(passport@0.6.0): resolution: {integrity: sha512-HplSJaimEAz1IOZEu+pdJHHJhQyBOPAYWXYHfAPQvRqWtw4FJF1VXl1Qtk9dcXQX1eKytDtH+qBzNQc19GWNEg==} peerDependencies: '@nestjs/common': ^8.0.0 || ^9.0.0 passport: ^0.4.0 || ^0.5.0 || ^0.6.0 dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.13.2)(reflect-metadata@0.1.14)(rxjs@7.8.1) passport: 0.6.0 /@nestjs/platform-express@9.4.3(@nestjs/common@9.4.3)(@nestjs/core@9.4.3): @@ -7023,7 +6999,7 @@ packages: '@nestjs/common': ^9.0.0 '@nestjs/core': ^9.0.0 dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(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) body-parser: 1.20.2 cors: 2.8.5 @@ -7060,7 +7036,7 @@ packages: '@nestjs/platform-express': optional: true dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(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/platform-express': 9.4.3(@nestjs/common@9.4.3)(@nestjs/core@9.4.3) tslib: 2.5.3 @@ -7193,7 +7169,6 @@ packages: /@one-ini/wasm@0.1.1: resolution: {integrity: sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==} - dev: false /@opentelemetry/api-logs@0.46.0: resolution: {integrity: sha512-+9BcqfiEDGPXEIo+o3tso/aqGM5dGbGwAkGVp3FPpZ8GlkK1YlaKRd9gMVyPaeRATwvO5wYGGnCsAc/sMMM9Qw==} @@ -9448,7 +9423,6 @@ packages: /@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==} @@ -9974,7 +9948,6 @@ packages: /abbrev@2.0.0: resolution: {integrity: sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - dev: false /accepts@1.3.8: resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==} @@ -10492,6 +10465,7 @@ packages: /attr-accept@2.2.2: resolution: {integrity: sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg==} engines: {node: '>=4'} + dev: false /attr-accept@2.2.5: resolution: {integrity: sha512-0bDNnY/u6pPwHDMoF0FieU354oBi0a8rD9FcsLwzcGWbc8KS8KPIi7y+s13OlVY+gMWc/9xEMUgNE6Qm8ZllYQ==} @@ -10816,7 +10790,7 @@ packages: peerDependencies: ajv: 4.11.8 - 8 dependencies: - '@babel/code-frame': 7.23.5 + '@babel/code-frame': 7.26.2 '@humanwhocodes/momoa': 2.0.4 ajv: 8.17.1 chalk: 4.1.2 @@ -11087,7 +11061,6 @@ packages: dependencies: no-case: 2.3.2 upper-case: 1.1.3 - dev: false /camel-case@4.1.2: resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==} @@ -11122,7 +11095,6 @@ packages: /camelize@1.0.1: resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==} - dev: false /caniuse-lite@1.0.30001680: resolution: {integrity: sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==} @@ -11321,7 +11293,6 @@ packages: engines: {node: '>= 4.0'} dependencies: source-map: 0.6.1 - dev: false /clean-css@5.3.3: resolution: {integrity: sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==} @@ -11497,14 +11468,12 @@ packages: dependencies: color-name: 1.1.4 simple-swizzle: 0.2.2 - dev: false /color@3.2.1: resolution: {integrity: sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==} dependencies: color-convert: 1.9.3 color-string: 1.9.1 - dev: false /colorette@2.0.19: resolution: {integrity: sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==} @@ -11623,7 +11592,6 @@ packages: dependencies: ini: 1.3.8 proto-list: 1.2.4 - dev: false /connect-history-api-fallback@2.0.0: resolution: {integrity: sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==} @@ -11835,7 +11803,6 @@ packages: /css-color-keywords@1.0.0: resolution: {integrity: sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==} engines: {node: '>=4'} - dev: false /css-loader@6.11.0(webpack@5.94.0): resolution: {integrity: sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==} @@ -11885,7 +11852,6 @@ packages: camelize: 1.0.1 css-color-keywords: 1.0.0 postcss-value-parser: 4.2.0 - dev: false /css-what@6.1.0: resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==} @@ -12265,7 +12231,6 @@ packages: engines: {node: '>= 4'} dependencies: domelementtype: 2.3.0 - dev: false /domhandler@4.3.1: resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==} @@ -12453,7 +12418,6 @@ packages: commander: 10.0.1 minimatch: 9.0.1 semver: 7.5.4 - dev: false /ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} @@ -12662,7 +12626,6 @@ packages: /escape-goat@3.0.0: resolution: {integrity: sha512-w3PwNZJwRxlp47QGzhuEBldEqVHHhh8/tIPcl6ecf2Bou99cdAt0knihBV0Ecc7CGxYduXVBDheH1K2oADRlvw==} engines: {node: '>=10'} - dev: false /escape-html@1.0.3: resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==} @@ -13503,6 +13466,7 @@ packages: engines: {node: '>= 12'} dependencies: tslib: 2.8.1 + dev: false /file-selector@2.1.0: resolution: {integrity: sha512-ZuXAqGePcSPz4JuerOY06Dzzq0hrmQ6VGoXVzGyFI1npeOfBgqGIKKpznfYWRkSLJlXutkqVC5WvGZtkFVhu9Q==} @@ -13817,6 +13781,7 @@ packages: /fstream@1.0.12: resolution: {integrity: sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==} engines: {node: '>=0.6'} + deprecated: This package is no longer supported. dependencies: graceful-fs: 4.2.11 inherits: 2.0.4 @@ -14002,7 +13967,6 @@ packages: minimatch: 9.0.5 minipass: 7.1.2 path-scurry: 1.11.1 - dev: false /glob@11.0.0: resolution: {integrity: sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==} @@ -14394,7 +14358,6 @@ packages: param-case: 2.1.1 relateurl: 0.2.7 uglify-js: 3.17.4 - dev: false /html-webpack-plugin@5.6.3(webpack@5.94.0): resolution: {integrity: sha512-QSf1yjtSAsmf7rYBV7XX86uua4W/vkhIt0xNXKbsi2foEeW7vjJQz4bhnpL3xH+l1ryl1680uNv968Z+X6jSYg==} @@ -14423,7 +14386,6 @@ packages: domhandler: 3.3.0 domutils: 2.8.0 entities: 2.2.0 - dev: false /htmlparser2@6.1.0: resolution: {integrity: sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==} @@ -14449,7 +14411,6 @@ packages: domhandler: 5.0.3 domutils: 3.1.0 entities: 4.5.0 - dev: false /http-cache-semantics@4.1.1: resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==} @@ -14695,7 +14656,6 @@ packages: /ini@1.3.8: resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} - dev: false /inquirer@8.2.4: resolution: {integrity: sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==} @@ -14832,7 +14792,6 @@ packages: /is-arrayish@0.3.2: resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==} - dev: false /is-async-function@2.0.0: resolution: {integrity: sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==} @@ -16188,7 +16147,6 @@ packages: glob: 10.3.15 js-cookie: 3.0.5 nopt: 7.2.1 - dev: false /js-cookie@3.0.5: resolution: {integrity: sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==} @@ -16438,7 +16396,6 @@ packages: web-resource-inliner: 6.0.1 transitivePeerDependencies: - encoding - dev: false /jwa@1.4.1: resolution: {integrity: sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==} @@ -16834,7 +16791,6 @@ packages: /lower-case@1.1.4: resolution: {integrity: sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==} - dev: false /lower-case@2.0.2: resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==} @@ -16987,7 +16943,6 @@ packages: /mensch@0.3.4: resolution: {integrity: sha512-IAeFvcOnV9V0Yk+bFhYR07O3yNina9ANIN5MoXBKYJ/RLYPurd2d0yw14MDhpr9/momp0WofT1bPUh3hkzdi/g==} - dev: false /meow@11.0.0: resolution: {integrity: sha512-Cl0yeeIrko6d94KpUo1M+0X1sB14ikoaqlIGuTH1fW4I+E3+YljL54/hb/BWmVfrV9tTV9zU04+xjw08Fh2WkA==} @@ -17070,7 +17025,6 @@ packages: resolution: {integrity: sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==} engines: {node: '>=4.0.0'} hasBin: true - dev: false /mime@3.0.0: resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==} @@ -17139,7 +17093,6 @@ packages: engines: {node: '>=16 || 14 >=14.17'} dependencies: brace-expansion: 2.0.1 - dev: false /minimatch@9.0.3: resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} @@ -17200,7 +17153,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-body@4.15.3: resolution: {integrity: sha512-7pfUOVPtmb0wC+oUOn4xBsAw4eT5DyD6xqaxj/kssu6RrFXOXgJaVnDPAI9AzIvXJ/5as9QrqRGYAddehwWpHQ==} @@ -17210,7 +17162,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-browser@4.15.3: resolution: {integrity: sha512-HS3YFo6mfle+TLnaRzUbDa9COwkm860lAuHXD5e7qxi90AVhGdAnG1KAVrriEfQSuYcAZbhZjZtp6GhvXi6XcA==} @@ -17224,7 +17175,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-carousel@4.15.3: resolution: {integrity: sha512-3ju6I4l7uUhPRrJfN3yK9AMsfHvrYbRkcJ1GRphFHzUj37B2J6qJOQUpzA547Y4aeh69TSb7HFVf1t12ejQxVw==} @@ -17234,7 +17184,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-cli@4.15.3: resolution: {integrity: sha512-+V2TDw3tXUVEptFvLSerz125C2ogYl8klIBRY1m5BHd4JvGVf3yhx8N3PngByCzA6PGcv/eydGQN+wy34SHf0Q==} @@ -17254,7 +17203,6 @@ packages: yargs: 17.7.2 transitivePeerDependencies: - encoding - dev: false /mjml-column@4.15.3: resolution: {integrity: sha512-hYdEFdJGHPbZJSEysykrevEbB07yhJGSwfDZEYDSbhQQFjV2tXrEgYcFD5EneMaowjb55e3divSJxU4c5q4Qgw==} @@ -17264,7 +17212,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-core@4.15.3: resolution: {integrity: sha512-Dmwk+2cgSD9L9GmTbEUNd8QxkTZtW9P7FN/ROZW/fGZD6Hq6/4TB0zEspg2Ow9eYjZXO2ofOJ3PaQEEShKV0kQ==} @@ -17281,7 +17228,6 @@ packages: mjml-validator: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-divider@4.15.3: resolution: {integrity: sha512-vh27LQ9FG/01y0b9ntfqm+GT5AjJnDSDY9hilss2ixIUh0FemvfGRfsGVeV5UBVPBKK7Ffhvfqc7Rciob9Spzw==} @@ -17291,7 +17237,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-group@4.15.3: resolution: {integrity: sha512-HSu/rKnGZVKFq3ciT46vi1EOy+9mkB0HewO4+P6dP/Y0UerWkN6S3UK11Cxsj0cAp0vFwkPDCdOeEzRdpFEkzA==} @@ -17301,7 +17246,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-head-attributes@4.15.3: resolution: {integrity: sha512-2ISo0r5ZKwkrvJgDou9xVPxxtXMaETe2AsAA02L89LnbB2KC0N5myNsHV0sEysTw9+CfCmgjAb0GAI5QGpxKkQ==} @@ -17311,7 +17255,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-head-breakpoint@4.15.3: resolution: {integrity: sha512-Eo56FA5C2v6ucmWQL/JBJ2z641pLOom4k0wP6CMZI2utfyiJ+e2Uuinj1KTrgDcEvW4EtU9HrfAqLK9UosLZlg==} @@ -17321,7 +17264,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-head-font@4.15.3: resolution: {integrity: sha512-CzV2aDPpiNIIgGPHNcBhgyedKY4SX3BJoTwOobSwZVIlEA6TAWB4Z9WwFUmQqZOgo1AkkiTHPZQvGcEhFFXH6g==} @@ -17331,7 +17273,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-head-html-attributes@4.15.3: resolution: {integrity: sha512-MDNDPMBOgXUZYdxhosyrA2kudiGO8aogT0/cODyi2Ed9o/1S7W+je11JUYskQbncqhWKGxNyaP4VWa+6+vUC/g==} @@ -17341,7 +17282,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-head-preview@4.15.3: resolution: {integrity: sha512-J2PxCefUVeFwsAExhrKo4lwxDevc5aKj888HBl/wN4EuWOoOg06iOGCxz4Omd8dqyFsrqvbBuPqRzQ+VycGmaA==} @@ -17351,7 +17291,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-head-style@4.15.3: resolution: {integrity: sha512-9J+JuH+mKrQU65CaJ4KZegACUgNIlYmWQYx3VOBR/tyz+8kDYX7xBhKJCjQ1I4wj2Tvga3bykd89Oc2kFZ5WOw==} @@ -17361,7 +17300,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-head-title@4.15.3: resolution: {integrity: sha512-IM59xRtsxID4DubQ0iLmoCGXguEe+9BFG4z6y2xQDrscIa4QY3KlfqgKGT69ojW+AVbXXJPEVqrAi4/eCsLItQ==} @@ -17371,7 +17309,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-head@4.15.3: resolution: {integrity: sha512-o3mRuuP/MB5fZycjD3KH/uXsnaPl7Oo8GtdbJTKtH1+O/3pz8GzGMkscTKa97l03DAG2EhGrzzLcU2A6eshwFw==} @@ -17381,7 +17318,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-hero@4.15.3: resolution: {integrity: sha512-9cLAPuc69yiuzNrMZIN58j+HMK1UWPaq2i3/Fg2ZpimfcGFKRcPGCbEVh0v+Pb6/J0+kf8yIO0leH20opu3AyQ==} @@ -17391,7 +17327,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-image@4.15.3: resolution: {integrity: sha512-g1OhSdofIytE9qaOGdTPmRIp7JsCtgO0zbsn1Fk6wQh2gEL55Z40j/VoghslWAWTgT2OHFdBKnMvWtN6U5+d2Q==} @@ -17401,7 +17336,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-migrate@4.15.3: resolution: {integrity: sha512-sr/+35RdxZroNQVegjpfRHJ5hda9XCgaS4mK2FGO+Mb1IUevKfeEPII3F/cHDpNwFeYH3kAgyqQ22ClhGLWNBA==} @@ -17415,7 +17349,6 @@ packages: yargs: 17.7.2 transitivePeerDependencies: - encoding - dev: false /mjml-navbar@4.15.3: resolution: {integrity: sha512-VsKH/Jdlf8Yu3y7GpzQV5n7JMdpqvZvTSpF6UQXL0PWOm7k6+LX+sCZimOfpHJ+wCaaybpxokjWZ71mxOoCWoA==} @@ -17425,7 +17358,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-parser-xml@4.15.3: resolution: {integrity: sha512-Tz0UX8/JVYICLjT+U8J1f/TFxIYVYjzZHeh4/Oyta0pLpRLeZlxEd71f3u3kdnulCKMP4i37pFRDmyLXAlEuLw==} @@ -17434,7 +17366,6 @@ packages: detect-node: 2.1.0 htmlparser2: 9.1.0 lodash: 4.17.21 - dev: false /mjml-preset-core@4.15.3: resolution: {integrity: sha512-1zZS8P4O0KweWUqNS655+oNnVMPQ1Rq1GaZq5S9JfwT1Vh/m516lSmiTW9oko6gGHytt5s6Yj6oOeu5Zm8FoLw==} @@ -17467,7 +17398,6 @@ packages: mjml-wrapper: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-raw@4.15.3: resolution: {integrity: sha512-IGyHheOYyRchBLiAEgw3UM11kFNmBSMupu2BDdejC6ZiDhEAdG+tyERlsCwDPYtXanvFpGWULIu3XlsUPc+RZw==} @@ -17477,7 +17407,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-section@4.15.3: resolution: {integrity: sha512-JfVPRXH++Hd933gmQfG8JXXCBCR6fIzC3DwiYycvanL/aW1cEQ2EnebUfQkt5QzlYjOkJEH+JpccAsq3ln6FZQ==} @@ -17487,7 +17416,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-social@4.15.3: resolution: {integrity: sha512-7sD5FXrESOxpT9Z4Oh36bS6u/geuUrMP1aCg2sjyAwbPcF1aWa2k9OcatQfpRf6pJEhUZ18y6/WBBXmMVmSzXg==} @@ -17497,7 +17425,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-spacer@4.15.3: resolution: {integrity: sha512-3B7Qj+17EgDdAtZ3NAdMyOwLTX1jfmJuY7gjyhS2HtcZAmppW+cxqHUBwCKfvSRgTQiccmEvtNxaQK+tfyrZqA==} @@ -17507,7 +17434,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-table@4.15.3: resolution: {integrity: sha512-FLx7DcRKTdKdcOCbMyBaeudeHaHpwPveRrBm6WyQe3LXx6FfdmOh59i71/16LFQMgBOD3N4/UJkzxLzlTJzMqQ==} @@ -17517,7 +17443,6 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-text@4.15.3: resolution: {integrity: sha512-+C0hxCmw9kg0XzT6vhE5mFkK6y225nC8UEQcN94K0fBCjPKkM+HqZMwGX205fzdGRi+Bxa55b/VhrIVwdv+8vw==} @@ -17527,13 +17452,11 @@ packages: mjml-core: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml-validator@4.15.3: resolution: {integrity: sha512-Xb72KdqRwjv/qM2rJpV22syyP2N3cRQ9VVDrN6u2FSzLq02buFNxmSPJ7CKhat3PrUNdVHU75KZwOf/tz4UEhA==} dependencies: '@babel/runtime': 7.24.5 - dev: false /mjml-wrapper@4.15.3: resolution: {integrity: sha512-ditsCijeHJrmBmObtJmQ18ddLxv5oPyMTdPU8Di8APOnD2zPk7Z4UAuJSl7HXB45oFiivr3MJf4koFzMUSZ6Gg==} @@ -17544,7 +17467,6 @@ packages: mjml-section: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mjml@4.15.3: resolution: {integrity: sha512-bW2WpJxm6HS+S3Yu6tq1DUPFoTxU9sPviUSmnL7Ua+oVO3WA5ILFWqvujUlz+oeuM+HCwEyMiP5xvKNPENVjYA==} @@ -17558,7 +17480,6 @@ packages: mjml-validator: 4.15.3 transitivePeerDependencies: - encoding - dev: false /mkdirp@0.5.6: resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==} @@ -17686,7 +17607,7 @@ packages: '@nestjs/common': ^9 '@nestjs/core': ^9 dependencies: - '@nestjs/common': 9.4.3(cache-manager@5.7.6)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1) + '@nestjs/common': 9.4.3(cache-manager@5.7.6)(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) commander: 8.3.0 ora: 5.4.1 @@ -17743,7 +17664,6 @@ packages: resolution: {integrity: sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==} dependencies: lower-case: 1.1.4 - dev: false /no-case@3.0.4: resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==} @@ -17799,7 +17719,6 @@ packages: hasBin: true dependencies: abbrev: 2.0.0 - dev: false /normalize-package-data@2.5.0: resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==} @@ -18214,7 +18133,6 @@ packages: resolution: {integrity: sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==} dependencies: no-case: 2.3.2 - dev: false /param-case@3.0.4: resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==} @@ -18662,6 +18580,7 @@ packages: resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} engines: {node: '>=10.13.0'} hasBin: true + dev: true /pretty-bytes@5.6.0: resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==} @@ -18737,7 +18656,6 @@ packages: /proto-list@1.2.4: resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==} - dev: false /protobufjs@7.2.6: resolution: {integrity: sha512-dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw==} @@ -18992,6 +18910,7 @@ packages: file-selector: 0.6.0 prop-types: 15.8.1 react: 17.0.2 + dev: false /react-dropzone@14.3.5(react@17.0.2): resolution: {integrity: sha512-9nDUaEEpqZLOz5v5SUcFA0CjM4vq8YbqO0WRls+EYT7+DvxUdzDPKNCPLqGfj3YL9MsniCLCD4RFA6M95V6KMQ==} @@ -19862,7 +19781,6 @@ packages: /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==} @@ -19916,7 +19834,6 @@ packages: /shallowequal@1.1.0: resolution: {integrity: sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==} - dev: false /shebang-command@1.2.0: resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==} @@ -19981,7 +19898,6 @@ packages: resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==} dependencies: is-arrayish: 0.3.2 - dev: false /sirv@1.0.19: resolution: {integrity: sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==} @@ -20044,7 +19960,6 @@ packages: /slick@1.12.2: resolution: {integrity: sha512-4qdtOGcBjral6YIBCWJ0ljFSKNLz9KkhbWtuGvUyRowl1kxfuE1x/Z/aJcaiilpb3do9bl5K7/1h9XC5wWpY/A==} - dev: false /slugify@1.6.6: resolution: {integrity: sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw==} @@ -20436,7 +20351,6 @@ packages: shallowequal: 1.1.0 stylis: 4.3.2 tslib: 2.6.2 - dev: false /styled-jsx@5.1.1(@babel/core@7.26.0)(react@18.3.1): resolution: {integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==} @@ -20460,7 +20374,6 @@ packages: /stylis@4.3.2: resolution: {integrity: sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg==} - dev: false /subscriptions-transport-ws@0.11.0(graphql@15.9.0): resolution: {integrity: sha512-8D4C6DIH5tGiAIpp5I0wD/xRlNiZAPGHygzCe7VzyzUoxHtawzjNAY9SUTXU05/EY2NMY9/9GF0ycizkXr1CWQ==} @@ -21125,7 +21038,6 @@ packages: resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==} engines: {node: '>=0.8.0'} hasBin: true - dev: false /uid@2.0.2: resolution: {integrity: sha512-u3xV3X7uzvi5b1MncmZo3i2Aw222Zk1keqLA1YkHldREkAhAqi65wuPfe7lHx8H/Wzy+8CE7S7uS3jekIM5s8g==} @@ -21262,7 +21174,6 @@ packages: /upper-case@1.1.3: resolution: {integrity: sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==} - dev: false /upper-case@2.0.2: resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==} @@ -21306,15 +21217,6 @@ 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 - /usehooks-ts@3.1.0(react@18.3.1): resolution: {integrity: sha512-bBIa7yUyPhE1BCc0GmR96VU/15l/9gP1Ch5mYdLcFBaFGQsdmXkvjV0TtOqW1yUd6VjIwDunm+flSciCQXujiw==} engines: {node: '>=16.15.0'} @@ -21323,7 +21225,6 @@ packages: dependencies: lodash.debounce: 4.0.8 react: 18.3.1 - dev: false /util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} @@ -21387,7 +21288,6 @@ packages: /valid-data-url@3.0.1: resolution: {integrity: sha512-jOWVmzVceKlVVdwjNSenT4PbGghU0SBIizAev8ofZVgivk/TVHXSbNL8LP6M3spZvkR9/QolkyJavGSX5Cs0UA==} engines: {node: '>=10'} - dev: false /validate-npm-package-license@3.0.4: resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} @@ -21503,7 +21403,6 @@ packages: valid-data-url: 3.0.1 transitivePeerDependencies: - encoding - dev: false /web-streams-polyfill@3.3.2: resolution: {integrity: sha512-3pRGuxRF5gpuZc0W+EpwQRmCD7gRqcDOMt688KmdlDAgAyaB1XlN0zq2njfDNm44XVdIouE7pZ6GzbdyH47uIQ==} From 918df310d7bf4caf3bef63a07690d3167a558f01 Mon Sep 17 00:00:00 2001 From: Raphael Blum Date: Tue, 21 Jan 2025 11:42:49 +0100 Subject: [PATCH 119/121] Fix merge conflicts --- .env | 4 -- demo/api/schema.gql | 6 +-- demo/api/src/app.module.ts | 2 - demo/api/src/config/config.ts | 1 - demo/api/src/config/environment-variables.ts | 9 +--- demo/campaign/package.json | 6 --- .../BrevoTestContactsGrid.tsx | 54 ++++++------------- packages/api/schema.gql | 7 +-- .../brevo-api/brevo-api-contact.service.ts | 8 --- .../api/src/config/brevo-module.config.ts | 1 - .../dto/email-campaign.filter.ts | 12 +---- 11 files changed, 21 insertions(+), 89 deletions(-) diff --git a/.env b/.env index bed9f14f..bdc8ebfa 100644 --- a/.env +++ b/.env @@ -82,9 +82,5 @@ NEXT_PUBLIC_CAMPAIGN_IS_PREVIEW=false REDIRECT_URL_FOR_IMPORT=$SITE_URL BREVO_ALLOWED_REDIRECT_URL=http://${DEV_DOMAIN:-localhost}${WORKAROUND_DOTENV_ISSUE}:${SITE_PORT} CAMPAIGNS_FRONTEND_URL=http://${DEV_DOMAIN:-localhost}${WORKAROUND_DOTENV_ISSUE}:${SITE_PORT} # doesn't work, TODO: add actual mailing frontend -<<<<<<< HEAD SITE_PREVIEW_SECRET=8f9d7e6b4c2a1b3c -======= -BREVO_FOLDER_ID=1 ->>>>>>> main diff --git a/demo/api/schema.gql b/demo/api/schema.gql index 9d3f53a5..8236e261 100644 --- a/demo/api/schema.gql +++ b/demo/api/schema.gql @@ -741,12 +741,8 @@ input EmailCampaignFilter { updatedAt: DateTimeFilter title: StringFilter subject: StringFilter -<<<<<<< HEAD - scheduledAt: DateTimeFilter -======= sendingState: SendingStateEnumFilter - scheduledAt: DateFilter ->>>>>>> main + scheduledAt: DateTimeFilter and: [EmailCampaignFilter!] or: [EmailCampaignFilter!] } diff --git a/demo/api/src/app.module.ts b/demo/api/src/app.module.ts index b2b2555c..adbef47e 100644 --- a/demo/api/src/app.module.ts +++ b/demo/api/src/app.module.ts @@ -149,13 +149,11 @@ export class AppModule { return { apiKey: config.brevo.apiKey, redirectUrlForImport: config.brevo.redirectUrlForImport, - folderId: config.brevo.folderId ?? 1, // folderId is required, folder #1 is created by default }; } else { return { apiKey: config.brevo.apiKey, redirectUrlForImport: config.brevo.redirectUrlForImport, - folderId: config.brevo.folderId ?? 1, // folderId is required, folder #1 is created by default }; } }, diff --git a/demo/api/src/config/config.ts b/demo/api/src/config/config.ts index ab674452..264b4093 100644 --- a/demo/api/src/config/config.ts +++ b/demo/api/src/config/config.ts @@ -58,7 +58,6 @@ export function createConfig(processEnv: NodeJS.ProcessEnv) { brevo: { apiKey: envVars.BREVO_API_KEY, redirectUrlForImport: envVars.REDIRECT_URL_FOR_IMPORT, - folderId: envVars.BREVO_FOLDER_ID, }, campaign: { url: envVars.CAMPAIGN_URL, diff --git a/demo/api/src/config/environment-variables.ts b/demo/api/src/config/environment-variables.ts index 8698d045..46e55232 100644 --- a/demo/api/src/config/environment-variables.ts +++ b/demo/api/src/config/environment-variables.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import { BlobStorageConfig, IsUndefinable } from "@comet/cms-api"; +import { BlobStorageConfig } from "@comet/cms-api"; import { Transform, Type } from "class-transformer"; import { IsBase64, IsBoolean, IsInt, IsOptional, IsString, MinLength, ValidateIf } from "class-validator"; @@ -130,14 +130,7 @@ export class EnvironmentVariables { @IsString() CAMPAIGN_BASIC_AUTH_PASSWORD: string; -<<<<<<< HEAD @IsString() @MinLength(16) SITE_PREVIEW_SECRET: string; -======= - @IsNumber() - @IsUndefinable() - @Type(() => Number) - BREVO_FOLDER_ID?: number; ->>>>>>> main } diff --git a/demo/campaign/package.json b/demo/campaign/package.json index c44235dd..be791557 100644 --- a/demo/campaign/package.json +++ b/demo/campaign/package.json @@ -69,17 +69,11 @@ "eslint": "^8.0.0", "npm-run-all2": "^5.0.2", "prettier": "^2.0.0", -<<<<<<< HEAD "rimraf": "^3.0.2", "tsconfig-paths": "^3.15.0", "typescript": "^4.9.5" }, "peerDependencies": { "mjml": "^4.7.0" -======= - "rimraf": "^3.0.0", - "tsconfig-paths": "^3.0.0", - "typescript": "^4.0.0" ->>>>>>> main } } diff --git a/packages/admin/src/brevoTestContacts/BrevoTestContactsGrid.tsx b/packages/admin/src/brevoTestContacts/BrevoTestContactsGrid.tsx index 7121e5c6..fde56649 100644 --- a/packages/admin/src/brevoTestContacts/BrevoTestContactsGrid.tsx +++ b/packages/admin/src/brevoTestContacts/BrevoTestContactsGrid.tsx @@ -65,7 +65,6 @@ function BrevoTestContactsGridToolbar({ defaultMessage: "Contact limit of 100 reached. You cannot add more contacts.", }); return ( -<<<<<<< HEAD @@ -80,46 +79,23 @@ function BrevoTestContactsGridToolbar({ - + + + + + -======= - <> - - - - - - - - - - - - - - - - - ->>>>>>> main ); } diff --git a/packages/api/schema.gql b/packages/api/schema.gql index 995c352f..8354eae1 100644 --- a/packages/api/schema.gql +++ b/packages/api/schema.gql @@ -285,12 +285,8 @@ input EmailCampaignFilter { updatedAt: DateTimeFilter title: StringFilter subject: StringFilter -<<<<<<< HEAD - scheduledAt: DateTimeFilter -======= sendingState: SendingStateEnumFilter - scheduledAt: DateFilter ->>>>>>> main + scheduledAt: DateTimeFilter and: [EmailCampaignFilter!] or: [EmailCampaignFilter!] } @@ -344,6 +340,7 @@ enum SubscribeResponse { SUCCESSFUL ERROR_UNKNOWN ERROR_CONTAINED_IN_ECG_RTR_LIST + ERROR_MAXIMAL_NUMBER_OF_TEST_CONTACTS_REACHED } input BrevoContactInput { diff --git a/packages/api/src/brevo-api/brevo-api-contact.service.ts b/packages/api/src/brevo-api/brevo-api-contact.service.ts index 42f8a7e6..527d3d24 100644 --- a/packages/api/src/brevo-api/brevo-api-contact.service.ts +++ b/packages/api/src/brevo-api/brevo-api-contact.service.ts @@ -216,20 +216,12 @@ export class BrevoApiContactsService { } public async createBrevoContactList(title: string, scope: EmailCampaignScopeInterface): Promise { -<<<<<<< HEAD const brevoConfig = await this.brevoConfigRepository.findOne({ scope }); -======= - const folderId = this.config.brevo.resolveConfig(scope).folderId; ->>>>>>> main try { const contactList = { name: title, -<<<<<<< HEAD folderId: brevoConfig?.folderId ?? 1, -======= - folderId: folderId ?? 1, ->>>>>>> main }; const data = await this.getContactsApi(scope).createList(contactList); diff --git a/packages/api/src/config/brevo-module.config.ts b/packages/api/src/config/brevo-module.config.ts index d60b4cbc..8b1efc10 100644 --- a/packages/api/src/config/brevo-module.config.ts +++ b/packages/api/src/config/brevo-module.config.ts @@ -11,7 +11,6 @@ export interface BrevoModuleConfig { resolveConfig: (scope: EmailCampaignScopeInterface) => { apiKey: string; redirectUrlForImport: string; - folderId?: number; }; BrevoContactAttributes?: Type; BrevoContactFilterAttributes?: Type; 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 dd9de4f1..8ac2039f 100644 --- a/packages/api/src/email-campaign/dto/email-campaign.filter.ts +++ b/packages/api/src/email-campaign/dto/email-campaign.filter.ts @@ -1,8 +1,4 @@ -<<<<<<< HEAD -import { DateTimeFilter, StringFilter } from "@comet/cms-api"; -======= -import { createEnumFilter, DateFilter, StringFilter } from "@comet/cms-api"; ->>>>>>> main +import { createEnumFilter, DateTimeFilter, StringFilter } from "@comet/cms-api"; import { Field, InputType } from "@nestjs/graphql"; import { Type } from "class-transformer"; import { IsOptional, ValidateNested } from "class-validator"; @@ -38,17 +34,13 @@ export class EmailCampaignFilter { @Type(() => StringFilter) subject?: StringFilter; -<<<<<<< HEAD - @Field(() => DateTimeFilter, { nullable: true }) -======= @Field(() => SendingStateEnumFilter, { nullable: true }) @ValidateNested() @IsOptional() @Type(() => SendingStateEnumFilter) sendingState?: SendingStateEnumFilter; - @Field(() => DateFilter, { nullable: true }) ->>>>>>> main + @Field(() => DateTimeFilter, { nullable: true }) @ValidateNested() @IsOptional() @Type(() => DateTimeFilter) From d5319bcd09597aee974b651d0fd863c086094020 Mon Sep 17 00:00:00 2001 From: juliawegmayr <109900447+juliawegmayr@users.noreply.github.com> Date: Tue, 21 Jan 2025 12:50:10 +0100 Subject: [PATCH 120/121] add changeset (#264) --- .changeset/nervous-rats-walk.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .changeset/nervous-rats-walk.md diff --git a/.changeset/nervous-rats-walk.md b/.changeset/nervous-rats-walk.md new file mode 100644 index 00000000..4666c09b --- /dev/null +++ b/.changeset/nervous-rats-walk.md @@ -0,0 +1,9 @@ +--- +"@comet/brevo-mail-rendering": major +"@comet/brevo-admin": major +"@comet/brevo-api": major +--- + +Add `mail-rendering` package for providing reuseable components for rendering emails + +Add new `NewsletterImageBlock` From 6ea53d051f90d6dfd63e5c37b4fef753d522156d Mon Sep 17 00:00:00 2001 From: juliawegmayr <109900447+juliawegmayr@users.noreply.github.com> Date: Tue, 21 Jan 2025 14:00:33 +0100 Subject: [PATCH 121/121] Regenerate schema (#266) --- packages/api/schema.gql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api/schema.gql b/packages/api/schema.gql index 8354eae1..6f7a9940 100644 --- a/packages/api/schema.gql +++ b/packages/api/schema.gql @@ -1,4 +1,4 @@ -type User { +type UserPermissionsUser { id: String! name: String! email: String!