[Conflicts] Merge main into next by vivid-planet-bot · Pull Request #1290 · vivid-planet/comet-starter

vivid-planet-bot · 2026-02-23T12:07:07Z

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.

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…n during setup (#1296)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: nsams <50764+nsams@users.noreply.github.com>

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: jamesricky <6264317+jamesricky@users.noreply.github.com>

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: johnnyomair <48853629+johnnyomair@users.noreply.github.com>

Co-authored-by: Claude <noreply@anthropic.com>

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: johnnyomair <48853629+johnnyomair@users.noreply.github.com>

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

renovate bot added 2 commits February 23, 2026 13:06

Update dependency @types/react to ^18.3.28 (#1267)

ecdf18b

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency @mui/material to ^7.3.8 (#1275)

73931d6

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

vivid-planet-bot force-pushed the merge-main-into-next branch from 5721691 to 35cae0c Compare February 23, 2026 12:07

Update Mikro-ORM to ^6.6.7 (#1284)

c04b7d1

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

vivid-planet-bot force-pushed the merge-main-into-next branch from 35cae0c to 50af7db Compare February 23, 2026 12:08

Update dependency swiper to ^12.1.2 (#1289)

bdac5e4

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

vivid-planet-bot force-pushed the merge-main-into-next branch from 50af7db to 9eccd5d Compare February 23, 2026 12:12

Update dependency @types/node to ^24.10.13 (#1277)

db8f51e

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

vivid-planet-bot force-pushed the merge-main-into-next branch from 9eccd5d to 024279c Compare February 23, 2026 12:18

@comet/create-app: Publish v1.165.0

231b1de

vivid-planet-bot force-pushed the merge-main-into-next branch from 024279c to aa798f6 Compare February 23, 2026 12:19

Remove create-app references from root package.json and .cspell.jso…

b0cc4e1

…n during setup (#1296)

vivid-planet-bot force-pushed the merge-main-into-next branch from aa798f6 to 923348b Compare February 24, 2026 08:26

@comet/create-app: Publish v1.166.0

4fc0fee

vivid-planet-bot force-pushed the merge-main-into-next branch from 923348b to dce80d8 Compare February 24, 2026 08:27

Update dependency eslint to ^9.39.3 (#1295)

3e4f29b

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

vivid-planet-bot force-pushed the merge-main-into-next branch from dce80d8 to bded36d Compare February 24, 2026 12:33

Update GraphQL Codegen to ^5.0.8 (#1293)

aa46829

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

vivid-planet-bot force-pushed the merge-main-into-next branch from bded36d to aea666a Compare February 24, 2026 12:34

Update NestJS to ^11.1.14 (#1298)

e77dae3

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

vivid-planet-bot force-pushed the merge-main-into-next branch from aea666a to 1ed18e6 Compare February 24, 2026 12:41

Update dependency glob to ^13.0.6 (#1292)

606fb11

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

vivid-planet-bot force-pushed the merge-main-into-next branch from 1ed18e6 to 733ba6f Compare February 24, 2026 13:04

@comet/create-app: Publish v1.167.0

908f90b

vivid-planet-bot force-pushed the merge-main-into-next branch from 733ba6f to 8f8d520 Compare February 24, 2026 13:05

Update dependency @formatjs/cli to ^6.13.0 (#1299)

6fe44c4

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

vivid-planet-bot force-pushed the merge-main-into-next branch from 8f8d520 to da9dd5c Compare February 24, 2026 13:09

Update dependency knip to ^5.85.0 (#1301)

616035b

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

vivid-planet-bot force-pushed the merge-main-into-next branch from da9dd5c to 5854f93 Compare February 24, 2026 13:21

@comet/create-app: Publish v1.168.0

1b875db

vivid-planet-bot force-pushed the merge-main-into-next branch from 8d6f789 to 27aa6ef Compare March 13, 2026 10:09

@comet/create-app: Publish v1.174.0

8070c31

vivid-planet-bot force-pushed the merge-main-into-next branch from 27aa6ef to 6ae32a4 Compare March 13, 2026 10:09

Prevent showing focus styling when clicking elements (#1341)

114b811

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

vivid-planet-bot force-pushed the merge-main-into-next branch from 6ae32a4 to ad6e63a Compare March 16, 2026 11:28

Remove NEXT_PUBLIC_SITE_URL from .env (#1343)

1874359

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: nsams <50764+nsams@users.noreply.github.com>

vivid-planet-bot force-pushed the merge-main-into-next branch from ad6e63a to 84fefbe Compare March 16, 2026 12:02

Update GraphQL Codegen (#1337)

9c178f8

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

vivid-planet-bot force-pushed the merge-main-into-next branch from 84fefbe to 49b3430 Compare March 17, 2026 08:10

Prevent layout-shift and white border on focus (#1351)

0d60c1b

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: jamesricky <6264317+jamesricky@users.noreply.github.com>

vivid-planet-bot force-pushed the merge-main-into-next branch from 49b3430 to 4f351d7 Compare March 17, 2026 13:28

Update NestJS to ^11.1.16 (#1328)

43cb9a4

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

vivid-planet-bot force-pushed the merge-main-into-next branch from 4f351d7 to 1983d90 Compare March 17, 2026 13:37

Update to COMET v8.20.0 and add install-agent-skills (#1355)

9073e06

vivid-planet-bot force-pushed the merge-main-into-next branch from 1983d90 to 71cae2f Compare March 17, 2026 14:31

Add intl:extract to Admin and Site lint-staged setup (#1340)

9611b02

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: johnnyomair <48853629+johnnyomair@users.noreply.github.com>

vivid-planet-bot force-pushed the merge-main-into-next branch from 71cae2f to 5ec7eb9 Compare March 18, 2026 07:46

Refactor ESLint configs to use defineConfig and globalIgnores (#1308)

d03b8c5

Co-authored-by: Claude <noreply@anthropic.com>

vivid-planet-bot force-pushed the merge-main-into-next branch from 5ec7eb9 to 0617d25 Compare March 18, 2026 09:50

@comet/create-app: Publish v1.175.0

dfdf991

vivid-planet-bot force-pushed the merge-main-into-next branch from 0617d25 to 8de8e6d Compare March 18, 2026 09:50

Use SITE_PORT consistently (#1357)

5dbf60b

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: johnnyomair <48853629+johnnyomair@users.noreply.github.com>

vivid-planet-bot force-pushed the merge-main-into-next branch from 8de8e6d to 7b6dbc8 Compare March 19, 2026 11:22

AGENTS.md: Keeping This File Up to Date (#1302)

ee3460a

vivid-planet-bot force-pushed the merge-main-into-next branch from 7b6dbc8 to db56a34 Compare March 19, 2026 11:26

Update dependency lint-staged to ^16.4.0 (#1330)

10384b4

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

vivid-planet-bot force-pushed the merge-main-into-next branch from db56a34 to 7a21589 Compare March 19, 2026 11:27

renovate bot and others added 2 commits March 19, 2026 16:42

Update OpenTelemetry (#1331)

a86b00a

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Merge main into next

93e409d

vivid-planet-bot force-pushed the merge-main-into-next branch from 7a21589 to 93e409d Compare March 19, 2026 15:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Conflicts] Merge main into next#1290

[Conflicts] Merge main into next#1290
vivid-planet-bot wants to merge 64 commits intonextfrom
merge-main-into-next

vivid-planet-bot commented Feb 23, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

vivid-planet-bot commented Feb 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

vivid-planet-bot commented Feb 23, 2026 •

edited

Loading