Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to COMET v7 #81

Merged
merged 46 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
4d11844
API: Update to COMET v7.2.1
thomasdax98 Sep 1, 2024
b715f80
API: Remove unnecessary dependencies
thomasdax98 Sep 1, 2024
5aca619
API: Update mikro orm
thomasdax98 Sep 1, 2024
2f15a01
API: Provide strategyName in createStaticCredentialsBasicStrategy
thomasdax98 Sep 1, 2024
c2756d7
API: Remove language from user
thomasdax98 Sep 1, 2024
09bb8fa
API: Rename PublicApi and DisableGlobalGuard to DisableCometGuards
thomasdax98 Sep 1, 2024
737df7a
API: Add changes to 'Support dependency injection in BlockData#transf…
thomasdax98 Sep 1, 2024
dfc467e
API: Remove CDN env vars and additionalMimeTypes
thomasdax98 Sep 1, 2024
ad1de1b
API: Replace DateFilter with DateTimeFilter
thomasdax98 Sep 1, 2024
b4bcec5
API: Import YouTubeVideoBlock from @comet/cms-api package
thomasdax98 Sep 1, 2024
8b30b0d
Admin: Update to COMET v7.2.1
thomasdax98 Sep 1, 2024
84c3cd7
Admin: Remove axios
thomasdax98 Sep 1, 2024
3dc4cd8
Admin: Remove @mui/styles
thomasdax98 Sep 1, 2024
4663a85
Admin: Rearrange components in App.tsx
thomasdax98 Sep 1, 2024
ea30044
Admin: Rename previewUrl prop of SiteConfig
thomasdax98 Sep 1, 2024
bbba4c2
Admin: Adjust content scope config for new Content Scope Picker
thomasdax98 Sep 1, 2024
20a8286
Admin: Remove EditPageLayout
thomasdax98 Sep 2, 2024
424831d
API: Update schema
thomasdax98 Sep 2, 2024
5caef44
Admin: Replace FinalFormSaveSplitButton with FinalFormSaveButton
thomasdax98 Sep 2, 2024
c0ba898
Admin: Configure all Toolbars correctly
thomasdax98 Sep 2, 2024
f7ed096
Admin: Import GridColDef from @comet/admin instead of @mui/x-data-grid
thomasdax98 Sep 2, 2024
f59b88d
API: Disable GraphQL field suggestions
thomasdax98 Sep 2, 2024
9e81ed0
Admin: Import admin theme types
thomasdax98 Sep 2, 2024
b4fbe6d
Admin: Replace Roboto with Roboto Flex
thomasdax98 Sep 2, 2024
56547a1
Admin: Remove unnecessary fragments
thomasdax98 Sep 2, 2024
5db3fb7
Admin: Remove custom ContentScopeIndicator from PagesPage
thomasdax98 Sep 2, 2024
fc2511c
Admin: Import YouTubeVideoBlock from @comet/cms-admin package
thomasdax98 Sep 2, 2024
e7bebbe
Admin: Import ContentScopeControls from @comet/cms-admin
thomasdax98 Sep 2, 2024
10d953c
Admin: Prettier ignore build folder
thomasdax98 Sep 2, 2024
a3c3b60
Site: Various changes
thomasdax98 Sep 2, 2024
c2a806b
Site: Switch to Next.js Preview Mode
thomasdax98 Sep 2, 2024
418d3b0
Campaign: Various changes
thomasdax98 Sep 2, 2024
277d581
Campaign: Remove preview
thomasdax98 Sep 2, 2024
40ba7d3
Merge branch 'next' into update-comet-to-v7
thomasdax98 Oct 29, 2024
6e514e8
Update to COMET v7.5.0
thomasdax98 Oct 29, 2024
9bce002
Fix API with workaround after switch to FileUploadsModule
thomasdax98 Oct 30, 2024
d2d92d2
Update to Next 14.2
thomasdax98 Oct 30, 2024
28c105a
Fix import in API
thomasdax98 Oct 30, 2024
36dfddf
Make sure to use the correct react version everywhere using pnpm over…
thomasdax98 Oct 30, 2024
d1b86c0
Fix PageLink type in campaign
thomasdax98 Oct 30, 2024
da548d1
Fix typing issue with mjml
thomasdax98 Oct 30, 2024
56ccf43
Fix block preview for site
thomasdax98 Oct 30, 2024
6ddef11
Fix block preview for campaign
thomasdax98 Oct 30, 2024
8de112e
Update Apollo client to fix cache error
thomasdax98 Oct 31, 2024
5105e4a
Remove MR marker
thomasdax98 Nov 4, 2024
9fa549a
Fix file upload URL
thomasdax98 Nov 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .changeset/fast-weeks-remember.md
Original file line number Diff line number Diff line change
@@ -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)
3 changes: 0 additions & 3 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion demo/admin/.prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ block-meta.json
lang-compiled/
lang/
schema.json
src/fragmentTypes.json
src/fragmentTypes.json
build/
22 changes: 10 additions & 12 deletions demo/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
144 changes: 83 additions & 61 deletions demo/admin/server/package-lock.json

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

Loading
Loading