Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into domain-not-found
Browse files Browse the repository at this point in the history
  • Loading branch information
fraxachun committed Feb 12, 2025
2 parents 1a7409e + 5d9af73 commit 51a3196
Show file tree
Hide file tree
Showing 21 changed files with 410 additions and 309 deletions.
5 changes: 0 additions & 5 deletions .github/auto_assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@ addAssignees: author
addReviewers: true

reviewers:
- dkarnutsch
- fraxachun
- johnnyomair
- nsams
- thomasdax98
- manuelblum

skipKeywords:
- Merge main into next
Expand Down
149 changes: 76 additions & 73 deletions admin/package-lock.json

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
},
"dependencies": {
"@apollo/client": "^3.11.9",
"@comet/admin": "^7.12.0",
"@comet/admin-icons": "^7.12.0",
"@comet/admin-theme": "^7.12.0",
"@comet/blocks-admin": "^7.12.0",
"@comet/cms-admin": "^7.12.0",
"@comet/admin": "7.13.0",
"@comet/admin-icons": "7.13.0",
"@comet/admin-theme": "7.13.0",
"@comet/blocks-admin": "7.13.0",
"@comet/cms-admin": "7.13.0",
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0",
"@fontsource-variable/roboto-flex": "^5.1.1",
Expand All @@ -57,13 +57,13 @@
"react-router-dom": "^5.3.4"
},
"devDependencies": {
"@comet/cli": "^7.12.0",
"@comet/eslint-config": "^7.12.0",
"@comet/cli": "7.13.0",
"@comet/eslint-config": "7.13.0",
"@cspell/eslint-plugin": "^8.17.3",
"@formatjs/cli": "^6.5.1",
"@formatjs/cli": "^6.6.1",
"@graphql-codegen/add": "^5.0.3",
"@graphql-codegen/cli": "^5.0.4",
"@graphql-codegen/fragment-matcher": "^5.0.2",
"@graphql-codegen/fragment-matcher": "^5.1.0",
"@graphql-codegen/introspection": "^4.0.3",
"@graphql-codegen/named-operations-object": "^3.1.0",
"@graphql-codegen/near-operation-file-preset": "^3.0.0",
Expand All @@ -72,7 +72,7 @@
"@parcel/watcher": "^2.5.1",
"@swc/plugin-emotion": "^3.0.13",
"@types/lodash.isequal": "^4.5.8",
"@types/node": "^22.12.0",
"@types/node": "^22.13.1",
"@types/react": "^17.0.83",
"@types/react-dom": "^17.0.26",
"@types/react-router": "^5.1.20",
Expand All @@ -81,7 +81,7 @@
"chokidar-cli": "^3.0.0",
"dotenv-cli": "^7.4.4",
"eslint": "^8.57.1",
"knip": "^5.43.6",
"knip": "^5.44.0",
"npm-run-all2": "^7.0.2",
"prettier": "^2.8.8",
"rimraf": "^6.0.1",
Expand Down
8 changes: 4 additions & 4 deletions admin/server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion admin/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "server",
"private": true,
"dependencies": {
"compression": "^1.7.5",
"compression": "^1.8.0",
"express": "^4.21.2",
"helmet": "^7.2.0"
},
Expand Down
66 changes: 33 additions & 33 deletions api/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"test:watch": "npm run test -- --watch"
},
"dependencies": {
"@comet/blocks-api": "^7.12.0",
"@comet/cms-api": "^7.12.0",
"@comet/blocks-api": "7.13.0",
"@comet/cms-api": "7.13.0",
"@mikro-orm/cli": "^5.9.8",
"@mikro-orm/core": "^5.9.8",
"@mikro-orm/migrations": "^5.9.8",
Expand All @@ -49,7 +49,7 @@
"class-transformer": "^0.5.1",
"class-validator": "^0.13.1",
"cli-progress": "^3.12.0",
"compression": "^1.7.5",
"compression": "^1.8.0",
"cookie-parser": "^1.4.7",
"express": "^4.21.2",
"graphql": "^15.10.1",
Expand All @@ -61,8 +61,8 @@
"uuid": "^8.3.2"
},
"devDependencies": {
"@comet/cli": "^7.12.0",
"@comet/eslint-config": "^7.12.0",
"@comet/cli": "7.13.0",
"@comet/eslint-config": "7.13.0",
"@cspell/eslint-plugin": "^8.17.3",
"@jest/types": "^29.6.3",
"@nestjs/cli": "^9.5.0",
Expand All @@ -73,13 +73,13 @@
"@types/cookie-parser": "^1.4.8",
"@types/express": "^4.17.21",
"@types/jest": "^27.5.2",
"@types/node": "^22.12.0",
"@types/node": "^22.13.1",
"@types/uuid": "^8.3.4",
"dotenv-cli": "^7.4.4",
"eslint": "^8.57.1",
"jest": "^29.7.0",
"jest-junit": "^16.0.0",
"knip": "^5.43.6",
"knip": "^5.44.0",
"npm-run-all2": "^7.0.2",
"prettier": "^2.8.8",
"ts-jest": "^29.2.5",
Expand Down
30 changes: 15 additions & 15 deletions create-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 51a3196

Please sign in to comment.