Skip to content

Commit 69a1919

Browse files
marcinkrasowskimarcinkrasowski
committed
feat: updated to latest version
1 parent c8cee01 commit 69a1919

File tree

19 files changed

+293
-210
lines changed

19 files changed

+293
-210
lines changed

‎apps/api-harmonization/package.json‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,25 @@
2020
"generate:component": "turbo gen api-component"
2121
},
2222
"dependencies": {
23+
"@dxp/blocks.bento-grid": "^0.1.0",
24+
"@dxp/blocks.cta-section": "^0.1.0",
25+
"@dxp/blocks.document-list": "^0.1.0",
26+
"@dxp/blocks.faq": "^0.1.1",
27+
"@dxp/blocks.feature-section": "^0.1.1",
28+
"@dxp/blocks.feature-section-grid": "^0.0.6",
29+
"@dxp/blocks.hero-section": "^0.1.0",
30+
"@dxp/blocks.media-section": "^0.1.0",
31+
"@dxp/blocks.pricing-section": "^0.1.0",
32+
"@dxp/blocks.quick-links": "^0.1.0",
33+
"@dxp/configs.integrations": "*",
34+
"@dxp/framework": "^0.1.0",
35+
"@dxp/utils.api-harmonization": "*",
2336
"@nestjs/axios": "^4.0.0",
2437
"@nestjs/common": "^11.1.1",
2538
"@nestjs/config": "^4.0.2",
2639
"@nestjs/core": "^11.1.1",
2740
"@nestjs/platform-express": "^11.1.1",
28-
"@dxp/framework": "*",
29-
"@dxp/integrations.mocked": "*",
30-
"@dxp/integrations.strapi-cms": "*",
31-
"@dxp/configs.integrations": "*",
3241
"@o2s/telemetry": "*",
33-
"@dxp/utils.api-harmonization": "*",
3442
"@o2s/utils.logger": "*",
3543
"compression": "^1.8.0",
3644
"cookie": "^1.0.2",
@@ -44,24 +52,15 @@
4452
"string-template": "^1.0.0",
4553
"survey-core": "^2.0.9",
4654
"winston": "^3.17.0",
47-
"xmlbuilder2": "^3.1.1",
48-
"@dxp/blocks.faq": "*",
49-
"@dxp/blocks.hero-section": "*",
50-
"@dxp/blocks.feature-section": "*",
51-
"@dxp/blocks.cta-section": "*",
52-
"@dxp/blocks.bento-grid": "*",
53-
"@dxp/blocks.media-section": "*",
54-
"@dxp/blocks.quick-links": "*",
55-
"@dxp/blocks.feature-section-grid": "*",
56-
"@dxp/blocks.pricing-section": "*"
55+
"xmlbuilder2": "^3.1.1"
5756
},
5857
"devDependencies": {
59-
"@nestjs/cli": "^11.0.7",
60-
"@nestjs/schematics": "^11.0.5",
61-
"@nestjs/testing": "^11.1.1",
6258
"@dxp/eslint-config": "*",
6359
"@dxp/prettier-config": "*",
6460
"@dxp/typescript-config": "*",
61+
"@nestjs/cli": "^11.0.7",
62+
"@nestjs/schematics": "^11.0.5",
63+
"@nestjs/testing": "^11.1.1",
6564
"@trivago/prettier-plugin-sort-imports": "^5.2.2",
6665
"@turbo/gen": "^2.5.3",
6766
"@types/compression": "^1.7.5",

‎apps/api-harmonization/src/app.module.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { configuration } from '@dxp/api-harmonization/config/configuration';
22
import * as BentoGrid from '@dxp/blocks.bento-grid/api-harmonization';
33
import * as CtaSection from '@dxp/blocks.cta-section/api-harmonization';
4+
import * as DocumentList from '@dxp/blocks.document-list/api-harmonization';
45
import * as Faq from '@dxp/blocks.faq/api-harmonization';
56
import * as FeatureSectionGrid from '@dxp/blocks.feature-section-grid/api-harmonization';
67
import * as FeatureSection from '@dxp/blocks.feature-section/api-harmonization';
@@ -63,6 +64,7 @@ export const AuthModuleBaseModule = AuthModule.Module.register(AppConfig);
6364
HeroSection.Module.register(AppConfig),
6465
FeatureSectionGrid.Module.register(AppConfig),
6566
PricingSection.Module.register(AppConfig),
67+
DocumentList.Module.register(AppConfig),
6668
// BLOCK REGISTER
6769
],
6870
providers: [

‎apps/api-harmonization/src/modules/page/page.model.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import * as BentoGrid from '@dxp/blocks.bento-grid/api-harmonization';
22
import * as CtaSection from '@dxp/blocks.cta-section/api-harmonization';
3+
import * as DocumentList from '@dxp/blocks.document-list/api-harmonization';
34
import * as Faq from '@dxp/blocks.faq/api-harmonization';
45
import * as FeatureSectionGrid from '@dxp/blocks.feature-section-grid/api-harmonization';
56
import * as FeatureSection from '@dxp/blocks.feature-section/api-harmonization';
@@ -58,6 +59,7 @@ export class PageData {
5859

5960
export type Blocks =
6061
// BLOCK REGISTER
62+
| DocumentList.Model.DocumentListBlock['__typename']
6163
| PricingSection.Model.PricingSectionBlock['__typename']
6264
| FeatureSectionGrid.Model.FeatureSectionGridBlock['__typename']
6365
| HeroSection.Model.HeroSectionBlock['__typename']

‎apps/frontend/package.json‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,19 @@
1313
},
1414
"dependencies": {
1515
"@dxp/api-harmonization": "*",
16-
"@dxp/framework": "*",
16+
"@dxp/blocks.bento-grid": "^0.1.0",
17+
"@dxp/blocks.cta-section": "^0.1.0",
18+
"@dxp/blocks.document-list": "^0.1.0",
19+
"@dxp/blocks.faq": "^0.1.1",
20+
"@dxp/blocks.feature-section": "^0.1.1",
21+
"@dxp/blocks.feature-section-grid": "^0.0.6",
22+
"@dxp/blocks.hero-section": "^0.1.0",
23+
"@dxp/blocks.media-section": "^0.1.0",
24+
"@dxp/blocks.pricing-section": "^0.1.0",
25+
"@dxp/blocks.quick-links": "^0.1.0",
26+
"@dxp/framework": "^0.1.0",
27+
"@dxp/integrations.mocked": "^0.2.0",
1728
"@dxp/ui": "*",
18-
"@dxp/integrations.mocked": "*",
1929
"class-variance-authority": "^0.7.1",
2030
"date-fns": "^4.1.0",
2131
"dotenv-cli": "^8.0.0",
@@ -35,22 +45,13 @@
3545
"survey-react-ui": "^2.0.9",
3646
"throttle-debounce": "^5.0.2",
3747
"yup": "^1.6.1",
38-
"zod": "^3.25.4",
39-
"@dxp/blocks.faq": "*",
40-
"@dxp/blocks.hero-section": "*",
41-
"@dxp/blocks.feature-section": "*",
42-
"@dxp/blocks.cta-section": "*",
43-
"@dxp/blocks.bento-grid": "*",
44-
"@dxp/blocks.media-section": "*",
45-
"@dxp/blocks.quick-links": "*",
46-
"@dxp/blocks.feature-section-grid": "*",
47-
"@dxp/blocks.pricing-section": "*"
48+
"zod": "^3.25.4"
4849
},
4950
"devDependencies": {
50-
"@next/bundle-analyzer": "^15.3.2",
5151
"@dxp/eslint-config": "*",
5252
"@dxp/prettier-config": "*",
5353
"@dxp/typescript-config": "*",
54+
"@next/bundle-analyzer": "^15.3.2",
5455
"@svgr/webpack": "^8.1.0",
5556
"@trivago/prettier-plugin-sort-imports": "^5.2.2",
5657
"@turbo/gen": "^2.5.3",
@@ -70,4 +71,4 @@
7071
"tsx": "^4.19.4",
7172
"typescript": "^5.8.3"
7273
}
73-
}
74+
}

‎apps/frontend/src/blocks/renderBlocks.tsx‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import { Modules } from '@dxp/api-harmonization';
44
import * as BentoGrid from '@dxp/blocks.bento-grid/frontend';
55
import * as CtaSection from '@dxp/blocks.cta-section/frontend';
6+
import * as DocumentList from '@dxp/blocks.document-list/frontend';
67
import * as Faq from '@dxp/blocks.faq/frontend';
78
import * as FeatureSectionGrid from '@dxp/blocks.feature-section-grid/frontend';
89
import * as FeatureSection from '@dxp/blocks.feature-section/frontend';
@@ -11,7 +12,6 @@ import * as MediaSection from '@dxp/blocks.media-section/frontend';
1112
import * as PricingSection from '@dxp/blocks.pricing-section/frontend';
1213
import * as QuickLinks from '@dxp/blocks.quick-links/frontend';
1314
// BLOCK IMPORT
14-
import { RoutingConfig } from 'next-intl/routing';
1515
import { getLocale } from 'next-intl/server';
1616
import React from 'react';
1717

@@ -28,16 +28,7 @@ interface BlockProps {
2828
slug: string[];
2929
locale: string;
3030
accessToken: string | undefined;
31-
routing: RoutingConfig<
32-
string[],
33-
'always',
34-
{
35-
[key: string]: {
36-
[locale: string]: string;
37-
};
38-
},
39-
never
40-
>;
31+
routing: typeof routing;
4132
}
4233

4334
export const renderBlocks = async (blocks: CMS.Model.Page.SlotBlock[], slug: string[]) => {
@@ -86,6 +77,8 @@ const renderBlock = (typename: string, blockProps: BlockProps) => {
8677
return <FeatureSectionGrid.Renderer {...blockProps} />;
8778
case 'PricingSectionBlock':
8879
return <PricingSection.Renderer {...blockProps} />;
80+
case 'DocumentListBlock':
81+
return <DocumentList.Renderer {...blockProps} />;
8982
// BLOCK REGISTER
9083
default:
9184
return null;

0 commit comments

Comments
 (0)