CXCDS-12024 fix translation schematics (#19012)

Co-authored-by: Artur Lasocha <[email protected]> Co-authored-by: Konrad Dzikowski <[email protected]>
SAP · Jul 11, 2024 · 166522a · 166522a
1 parent 77ba8c2
commit 166522a
Show file tree

Hide file tree

Showing 40 changed files with 101 additions and 13 deletions.
diff --git a/core-libs/setup/tsconfig.spec.json b/core-libs/setup/tsconfig.spec.json
@@ -549,6 +549,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/feature-libs/asm/tsconfig.schematics.json b/feature-libs/asm/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/feature-libs/cart/tsconfig.schematics.json b/feature-libs/cart/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/feature-libs/checkout/tsconfig.schematics.json b/feature-libs/checkout/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/feature-libs/customer-ticketing/tsconfig.schematics.json b/feature-libs/customer-ticketing/tsconfig.schematics.json
@@ -559,6 +559,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/feature-libs/estimated-delivery-date/tsconfig.schematics.json b/feature-libs/estimated-delivery-date/tsconfig.schematics.json
@@ -559,6 +559,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/feature-libs/order/tsconfig.schematics.json b/feature-libs/order/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/feature-libs/organization/tsconfig.schematics.json b/feature-libs/organization/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/feature-libs/pdf-invoices/tsconfig.schematics.json b/feature-libs/pdf-invoices/tsconfig.schematics.json
@@ -559,6 +559,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/feature-libs/pickup-in-store/tsconfig.schematics.json b/feature-libs/pickup-in-store/tsconfig.schematics.json
@@ -562,6 +562,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/feature-libs/product-configurator/tsconfig.schematics.json b/feature-libs/product-configurator/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/feature-libs/product/tsconfig.schematics.json b/feature-libs/product/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/feature-libs/qualtrics/tsconfig.schematics.json b/feature-libs/qualtrics/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/feature-libs/quote/tsconfig.schematics.json b/feature-libs/quote/tsconfig.schematics.json
@@ -562,6 +562,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/feature-libs/requested-delivery-date/tsconfig.schematics.json b/feature-libs/requested-delivery-date/tsconfig.schematics.json
@@ -559,6 +559,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/feature-libs/smartedit/tsconfig.schematics.json b/feature-libs/smartedit/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/feature-libs/storefinder/tsconfig.schematics.json b/feature-libs/storefinder/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/feature-libs/tracking/tsconfig.schematics.json b/feature-libs/tracking/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/feature-libs/user/tsconfig.schematics.json b/feature-libs/user/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/integration-libs/cdc/tsconfig.schematics.json b/integration-libs/cdc/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/integration-libs/cdp/tsconfig.schematics.json b/integration-libs/cdp/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/integration-libs/cds/assets/ng-package.json b/integration-libs/cds/assets/ng-package.json
@@ -0,0 +1,6 @@
+{
+ "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+ "lib": {
+ "entryFile": "./public_api.ts"
+ }
+}
diff --git a/integration-libs/cds/assets/index.ts → integration-libs/cds/assets/public_api.ts b/integration-libs/cds/assets/index.ts → integration-libs/cds/assets/public_api.ts
diff --git a/integration-libs/cds/public_api.ts b/integration-libs/cds/public_api.ts
@@ -12,4 +12,8 @@ export * from './src/cds.module';
 export * from './src/config/index';
 export * from './src/merchandising/index';
 export * from './src/profiletag/index';
-export * from './assets/index';
+
+/**
+ * @deprecated Use @spartacus/cds/assets instead.
+ */
+export * from './src/assets/index';
diff --git a/integration-libs/cds/src/assets/index.ts b/integration-libs/cds/src/assets/index.ts
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: 2024 SAP Spartacus team <[email protected]>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { TranslationChunksConfig, TranslationResources } from '@spartacus/core';
+import {
+ cdsTranslations as originalCdsTranslations,
+ cdsTranslationChunksConfig as originalCdsTranslationChunksConfig,
+} from '@spartacus/cds/assets';
+
+/** @deprecated Use @spartacus/cds/assets instead */
+export const cdsTranslations: TranslationResources = originalCdsTranslations;
+
+/** @deprecated Use @spartacus/cds/assets instead */
+export const cdsTranslationChunksConfig: TranslationChunksConfig =
+ originalCdsTranslationChunksConfig;
diff --git a/integration-libs/cds/src/schematics/add-cds/__snapshots__/index_spec.ts.snap b/integration-libs/cds/src/schematics/add-cds/__snapshots__/index_spec.ts.snap
@@ -3,14 +3,21 @@
 exports[`Spartacus CDS schematics: ng-add CDS feature with Profile tag configured general setup should create the feature module 1`] = `
 "import { NgModule } from '@angular/core';
 import { CdsConfig, CdsModule } from "@spartacus/cds";
-import { provideConfig } from "@spartacus/core";
+import { cdsTranslationChunksConfig, cdsTranslations } from "@spartacus/cds/assets";
+import { I18nConfig, provideConfig } from "@spartacus/core";
 
 @NgModule({
  declarations: [],
  imports: [
  CdsModule.forRoot()
  ],
- providers: [provideConfig(<CdsConfig>{
+ providers: [provideConfig(<I18nConfig>{
+ i18n: {
+ resources: cdsTranslations,
+ chunks: cdsTranslationChunksConfig,
+ },
+ }),
+ provideConfig(<CdsConfig>{
  cds: {
  tenant: 'my-tenant',
  baseUrl: 'my-base-url.com',
@@ -42,14 +49,21 @@ export class CdsFeatureModule { }
 exports[`Spartacus CDS schematics: ng-add CDS feature without Profile tag general setup should create the feature module 1`] = `
 "import { NgModule } from '@angular/core';
 import { CdsConfig, CdsModule } from "@spartacus/cds";
-import { provideConfig } from "@spartacus/core";
+import { cdsTranslationChunksConfig, cdsTranslations } from "@spartacus/cds/assets";
+import { I18nConfig, provideConfig } from "@spartacus/core";
 
 @NgModule({
  declarations: [],
  imports: [
  CdsModule.forRoot()
  ],
- providers: [provideConfig(<CdsConfig>{
+ providers: [provideConfig(<I18nConfig>{
+ i18n: {
+ resources: cdsTranslations,
+ chunks: cdsTranslationChunksConfig,
+ },
+ }),
+ provideConfig(<CdsConfig>{
  cds: {
  tenant: 'my-tenant',
  baseUrl: 'my-base-url.com',

diff --git a/integration-libs/cds/tsconfig.schematics.json b/integration-libs/cds/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/integration-libs/digital-payments/tsconfig.schematics.json b/integration-libs/digital-payments/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/integration-libs/epd-visualization/tsconfig.schematics.json b/integration-libs/epd-visualization/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/integration-libs/opps/tsconfig.schematics.json b/integration-libs/opps/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/integration-libs/s4om/tsconfig.schematics.json b/integration-libs/s4om/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/integration-libs/segment-refs/tsconfig.schematics.json b/integration-libs/segment-refs/tsconfig.schematics.json
@@ -546,6 +546,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/projects/schematics/src/shared/lib-configs/integration-libs/cds-schematics-config.ts b/projects/schematics/src/shared/lib-configs/integration-libs/cds-schematics-config.ts
@@ -8,6 +8,7 @@ import { CDS_CONFIG } from '../../constants';
 import {
  CDS_FEATURE_NAME,
  SPARTACUS_CDS,
+ SPARTACUS_CDS_ASSETS,
  TRACKING_PERSONALIZATION_FEATURE_NAME,
 } from '../../libs-constants';
 import {
@@ -28,6 +29,9 @@ export const CDS_MODULE_NAME = 'Cds';
 
 export const CDS_MODULE = 'CdsModule';
 
+export const CDS_TRANSLATIONS = 'cdsTranslations';
+export const CDS_TRANSLATION_CHUNKS_CONFIG = 'cdsTranslationChunksConfig';
+
 export const CDS_SCHEMATICS_CONFIG: SchematicConfig = {
  library: {
  featureName: CDS_FEATURE_NAME,
@@ -42,6 +46,11 @@ export const CDS_SCHEMATICS_CONFIG: SchematicConfig = {
  },
  customConfig: buildCdsConfig,
  dependencyFeatures: [TRACKING_PERSONALIZATION_FEATURE_NAME],
+ i18n: {
+ resources: CDS_TRANSLATIONS,
+ chunks: CDS_TRANSLATION_CHUNKS_CONFIG,
+ importPath: SPARTACUS_CDS_ASSETS,
+ },
 };
 
 function buildCdsConfig(

diff --git a/projects/schematics/src/shared/libs-constants.ts b/projects/schematics/src/shared/libs-constants.ts
@@ -190,6 +190,8 @@ export const SPARTACUS_USER_PROFILE_ROOT = `@spartacus/user/profile/root`;
 
 export const SPARTACUS_CDS = `@spartacus/cds`;
 
+export const SPARTACUS_CDS_ASSETS = `@spartacus/cds/assets`;
+
 export const SPARTACUS_CDP = `@spartacus/cdp`;
 export const SPARTACUS_CDP_CUSTOMER_TICKETING =
  '@spartacus/cdp/customer-ticketing';

diff --git a/projects/storefrontapp/src/app/spartacus/features/cds/cds-feature.module.ts b/projects/storefrontapp/src/app/spartacus/features/cds/cds-feature.module.ts
@@ -5,18 +5,17 @@
  */
 
 import { NgModule } from '@angular/core';
-import {
- CdsConfig,
- CdsModule,
- cdsTranslationChunksConfig,
- cdsTranslations,
-} from '@spartacus/cds';
+import { CdsConfig, CdsModule } from '@spartacus/cds';
 import {
  I18nConfig,
  provideConfig,
  provideConfigFactory,
  WindowRef,
 } from '@spartacus/core';
+import {
+ cdsTranslationChunksConfig,
+ cdsTranslations,
+} from '@spartacus/cds/assets';
 
 const cds1: CdsConfig = {
  cds: {

diff --git a/projects/storefrontapp/tsconfig.app.prod.json b/projects/storefrontapp/tsconfig.app.prod.json
@@ -353,6 +353,7 @@
  "@spartacus/cdc/user-profile": ["dist/cdc/user-profile"],
  "@spartacus/cdp/customer-ticketing": ["dist/cdp/customer-ticketing"],
  "@spartacus/cdp": ["dist/cdp"],
+ "@spartacus/cds/assets": ["dist/cds/assets"],
  "@spartacus/cds": ["dist/cds"],
  "@spartacus/digital-payments/assets": ["dist/digital-payments/assets"],
  "@spartacus/digital-payments": ["dist/digital-payments"],

diff --git a/projects/storefrontapp/tsconfig.server.json b/projects/storefrontapp/tsconfig.server.json
@@ -549,6 +549,7 @@
  "../../integration-libs/cdp/customer-ticketing/public_api"
  ],
  "@spartacus/cdp": ["../../integration-libs/cdp/public_api"],
+ "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"],
  "@spartacus/cds": ["../../integration-libs/cds/public_api"],
  "@spartacus/digital-payments/assets": [
  "../../integration-libs/digital-payments/assets/public_api"

diff --git a/projects/storefrontapp/tsconfig.server.prod.json b/projects/storefrontapp/tsconfig.server.prod.json
@@ -402,6 +402,7 @@
  "../../dist/cdp/customer-ticketing"
  ],
  "@spartacus/cdp": ["../../dist/cdp"],
+ "@spartacus/cds/assets": ["../../dist/cds/assets"],
  "@spartacus/cds": ["../../dist/cds"],
  "@spartacus/digital-payments/assets": [
  "../../dist/digital-payments/assets"