Skip to content

Commit d8a636c

Browse files
spike-rabbittimowolf
authored andcommitted
fix(translate-ng): prevent unwanted import of ngx-translate
The `@siemens/element-translate-ng` should have never existed, as it imports all framework specific translation layers. So when importing something from that entrypoint, an app automatically loads all translation frameworks we support. This entrypoint should be dropped with v49.
1 parent 8328563 commit d8a636c

File tree

6 files changed

+33
-25
lines changed

6 files changed

+33
-25
lines changed

api-goldens/element-ng/application-header/index.api.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { OnDestroy } from '@angular/core';
1515
import { OnInit } from '@angular/core';
1616
import * as rxjs from 'rxjs';
1717
import * as _siemens_element_ng_application_header from '@siemens/element-ng/application-header';
18-
import * as _siemens_element_translate_ng from '@siemens/element-translate-ng';
18+
import * as _siemens_element_translate_ng_translate_types from '@siemens/element-translate-ng/translate-types';
1919
import { SiHeaderDropdownTriggerDirective } from '@siemens/element-ng/header-dropdown';
2020
import { SimpleChanges } from '@angular/core';
2121
import { Subject } from 'rxjs';
@@ -94,7 +94,7 @@ export class SiApplicationHeaderComponent implements HeaderWithDropdowns, OnDest
9494
// (undocumented)
9595
readonly launchpad: _angular_core.InputSignal<TemplateRef<void> | undefined>;
9696
// (undocumented)
97-
readonly launchpadLabel: _angular_core.InputSignal<_siemens_element_translate_ng.TranslatableString>;
97+
readonly launchpadLabel: _angular_core.InputSignal<_siemens_element_translate_ng_translate_types.TranslatableString>;
9898
// (undocumented)
9999
protected readonly launchpadOpen: _angular_core.WritableSignal<boolean>;
100100
// (undocumented)
@@ -108,7 +108,7 @@ export class SiApplicationHeaderComponent implements HeaderWithDropdowns, OnDest
108108
// (undocumented)
109109
protected toggleMobileNavigationExpanded(): void;
110110
// (undocumented)
111-
protected toggleNavigation: _siemens_element_translate_ng.TranslatableString;
111+
protected toggleNavigation: _siemens_element_translate_ng_translate_types.TranslatableString;
112112
// (undocumented)
113113
static ɵcmp: _angular_core.ɵɵComponentDeclaration<SiApplicationHeaderComponent, "si-application-header", never, { "expandBreakpoint": { "alias": "expandBreakpoint"; "required": false; "isSignal": true; }; "launchpad": { "alias": "launchpad"; "required": false; "isSignal": true; }; "launchpadLabel": { "alias": "launchpadLabel"; "required": false; "isSignal": true; }; }, {}, never, ["si-header-brand, element-header-brand", "si-header-navigation, element-header-navigation", "si-header-actions, element-header-actions"], true, never>;
114114
// (undocumented)
@@ -159,7 +159,7 @@ export class SiHeaderCollapsibleActionsComponent implements OnDestroy {
159159
protected readonly icons: Record<"elementOptionsVertical", string>;
160160
// (undocumented)
161161
protected readonly id: string;
162-
readonly mobileToggleLabel: _angular_core.InputSignal<_siemens_element_translate_ng.TranslatableString>;
162+
readonly mobileToggleLabel: _angular_core.InputSignal<_siemens_element_translate_ng_translate_types.TranslatableString>;
163163
// (undocumented)
164164
ngOnDestroy(): void;
165165
// (undocumented)
@@ -235,11 +235,11 @@ export class SiLaunchpadFactoryComponent {
235235
protected readonly categories: _angular_core.Signal<AppCategory[]>;
236236
// (undocumented)
237237
protected closeLaunchpad(): void;
238-
readonly closeText: _angular_core.InputSignal<_siemens_element_translate_ng.TranslatableString>;
238+
readonly closeText: _angular_core.InputSignal<_siemens_element_translate_ng_translate_types.TranslatableString>;
239239
readonly enableFavorites: _angular_core.InputSignalWithTransform<boolean, unknown>;
240240
// (undocumented)
241241
protected escape(): void;
242-
readonly favoriteAppsText: _angular_core.InputSignal<_siemens_element_translate_ng.TranslatableString>;
242+
readonly favoriteAppsText: _angular_core.InputSignal<_siemens_element_translate_ng_translate_types.TranslatableString>;
243243
// (undocumented)
244244
readonly favoriteChange: _angular_core.OutputEmitterRef<FavoriteChangeEvent>;
245245
// (undocumented)
@@ -252,10 +252,10 @@ export class SiLaunchpadFactoryComponent {
252252
protected isCategories(items: App[] | AppCategory[]): items is AppCategory[];
253253
// (undocumented)
254254
protected showAllApps: boolean;
255-
readonly showLessAppsText: _angular_core.InputSignal<_siemens_element_translate_ng.TranslatableString>;
256-
readonly showMoreAppsText: _angular_core.InputSignal<_siemens_element_translate_ng.TranslatableString>;
257-
readonly subtitleText: _angular_core.InputSignal<_siemens_element_translate_ng.TranslatableString>;
258-
readonly titleText: _angular_core.InputSignal<_siemens_element_translate_ng.TranslatableString>;
255+
readonly showLessAppsText: _angular_core.InputSignal<_siemens_element_translate_ng_translate_types.TranslatableString>;
256+
readonly showMoreAppsText: _angular_core.InputSignal<_siemens_element_translate_ng_translate_types.TranslatableString>;
257+
readonly subtitleText: _angular_core.InputSignal<_siemens_element_translate_ng_translate_types.TranslatableString>;
258+
readonly titleText: _angular_core.InputSignal<_siemens_element_translate_ng_translate_types.TranslatableString>;
259259
// (undocumented)
260260
protected toggleFavorite(app: App, favorite: boolean): void;
261261
// (undocumented)

api-goldens/element-ng/navbar/index.api.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { OnDestroy } from '@angular/core';
1818
import { OnInit } from '@angular/core';
1919
import * as rxjs from 'rxjs';
2020
import { SiApplicationHeaderComponent } from '@siemens/element-ng/application-header';
21-
import * as _siemens_element_translate_ng from '@siemens/element-translate-ng';
21+
import * as _siemens_element_translate_ng_translate_types from '@siemens/element-translate-ng/translate-types';
2222
import { SiHeaderCollapsibleActionsComponent } from '@siemens/element-ng/application-header';
2323
import { SiHeaderDropdownTriggerDirective } from '@siemens/element-ng/header-dropdown';
2424
import { SimpleChanges } from '@angular/core';
@@ -95,14 +95,14 @@ export class SiNavbarPrimaryComponent implements OnChanges, HeaderWithDropdowns
9595
readonly appItemFavoriteChanged: _angular_core.OutputEmitterRef<[AppItem, boolean]>;
9696
readonly appItems: _angular_core.InputSignal<AppItem[] | undefined>;
9797
readonly appItemsFavorites: _angular_core.InputSignalWithTransform<boolean, unknown>;
98-
readonly appSwitcherSubTitle: _angular_core.InputSignal<_siemens_element_translate_ng.TranslatableString>;
99-
readonly appSwitcherTitle: _angular_core.InputSignal<_siemens_element_translate_ng.TranslatableString>;
98+
readonly appSwitcherSubTitle: _angular_core.InputSignal<_siemens_element_translate_ng_translate_types.TranslatableString>;
99+
readonly appSwitcherTitle: _angular_core.InputSignal<_siemens_element_translate_ng_translate_types.TranslatableString>;
100100
readonly appTitle: _angular_core.InputSignal<string | undefined>;
101101
readonly ariaLabelMainMenu: _angular_core.InputSignal<string>;
102102
readonly ariaLabelSecondaryMenu: _angular_core.InputSignal<string>;
103-
readonly closeAppSwitcherText: _angular_core.InputSignal<_siemens_element_translate_ng.TranslatableString>;
104-
readonly defaultAppsTitle: _angular_core.InputSignal<_siemens_element_translate_ng.TranslatableString>;
105-
readonly favoriteAppsTitle: _angular_core.InputSignal<_siemens_element_translate_ng.TranslatableString>;
103+
readonly closeAppSwitcherText: _angular_core.InputSignal<_siemens_element_translate_ng_translate_types.TranslatableString>;
104+
readonly defaultAppsTitle: _angular_core.InputSignal<_siemens_element_translate_ng_translate_types.TranslatableString>;
105+
readonly favoriteAppsTitle: _angular_core.InputSignal<_siemens_element_translate_ng_translate_types.TranslatableString>;
106106
readonly focusOnLoad: _angular_core.InputSignalWithTransform<boolean, unknown>;
107107
readonly home: _angular_core.InputSignal<Link | undefined>;
108108
readonly logoUrl: _angular_core.InputSignal<string | undefined>;
@@ -111,11 +111,11 @@ export class SiNavbarPrimaryComponent implements OnChanges, HeaderWithDropdowns
111111
protected newAppItems?: App[] | AppCategory[];
112112
// (undocumented)
113113
protected onFavoriteChange({ app, favorite }: FavoriteChangeEvent): void;
114-
readonly openAppSwitcherText: _angular_core.InputSignal<_siemens_element_translate_ng.TranslatableString>;
114+
readonly openAppSwitcherText: _angular_core.InputSignal<_siemens_element_translate_ng_translate_types.TranslatableString>;
115115
readonly primaryItems: _angular_core.InputSignal<MenuItem[]>;
116-
readonly showLessAppsTitle: _angular_core.InputSignal<_siemens_element_translate_ng.TranslatableString>;
117-
readonly showMoreAppsTitle: _angular_core.InputSignal<_siemens_element_translate_ng.TranslatableString>;
118-
readonly toggleNavigationText: _angular_core.InputSignal<_siemens_element_translate_ng.TranslatableString>;
116+
readonly showLessAppsTitle: _angular_core.InputSignal<_siemens_element_translate_ng_translate_types.TranslatableString>;
117+
readonly showMoreAppsTitle: _angular_core.InputSignal<_siemens_element_translate_ng_translate_types.TranslatableString>;
118+
readonly toggleNavigationText: _angular_core.InputSignal<_siemens_element_translate_ng_translate_types.TranslatableString>;
119119
// (undocumented)
120120
static ɵcmp: _angular_core.ɵɵComponentDeclaration<SiNavbarPrimaryComponent, "si-navbar-primary", never, { "primaryItems": { "alias": "primaryItems"; "required": false; "isSignal": true; }; "accountItems": { "alias": "accountItems"; "required": false; "isSignal": true; }; "account": { "alias": "account"; "required": false; "isSignal": true; }; "logoUrl": { "alias": "logoUrl"; "required": false; "isSignal": true; }; "appTitle": { "alias": "appTitle"; "required": false; "isSignal": true; }; "home": { "alias": "home"; "required": false; "isSignal": true; }; "appSwitcherTitle": { "alias": "appSwitcherTitle"; "required": false; "isSignal": true; }; "appSwitcherSubTitle": { "alias": "appSwitcherSubTitle"; "required": false; "isSignal": true; }; "favoriteAppsTitle": { "alias": "favoriteAppsTitle"; "required": false; "isSignal": true; }; "defaultAppsTitle": { "alias": "defaultAppsTitle"; "required": false; "isSignal": true; }; "showMoreAppsTitle": { "alias": "showMoreAppsTitle"; "required": false; "isSignal": true; }; "showLessAppsTitle": { "alias": "showLessAppsTitle"; "required": false; "isSignal": true; }; "appItems": { "alias": "appItems"; "required": false; "isSignal": true; }; "appCategoryItems": { "alias": "appCategoryItems"; "required": false; "isSignal": true; }; "appItemsFavorites": { "alias": "appItemsFavorites"; "required": false; "isSignal": true; }; "allAppsLink": { "alias": "allAppsLink"; "required": false; "isSignal": true; }; "focusOnLoad": { "alias": "focusOnLoad"; "required": false; "isSignal": true; }; "navAriaLabel": { "alias": "navAriaLabel"; "required": false; "isSignal": true; }; "closeAppSwitcherText": { "alias": "closeAppSwitcherText"; "required": false; "isSignal": true; }; "openAppSwitcherText": { "alias": "openAppSwitcherText"; "required": false; "isSignal": true; }; "toggleNavigationText": { "alias": "toggleNavigationText"; "required": false; "isSignal": true; }; "ariaLabelMainMenu": { "alias": "ariaLabelMainMenu"; "required": false; "isSignal": true; }; "ariaLabelSecondaryMenu": { "alias": "ariaLabelSecondaryMenu"; "required": false; "isSignal": true; }; }, { "appItemFavoriteChanged": "appItemFavoriteChanged"; }, never, ["*", "si-navbar-item[quickAction], element-navbar-item[quickAction='true']"], true, never>;
121121
// (undocumented)

eslint.config.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,12 @@ export const tsConfig = defineConfig({
7474
{
7575
name: '@ngx-translate/core',
7676
importNames: ['TranslatePipe'],
77-
message: 'Use `SiTranslatePipe` from `@siemens/element-translate-ng` instead.'
77+
message: 'Use `SiTranslatePipe` from `@siemens/element-translate-ng/translate` instead.'
78+
},
79+
{
80+
name: '@siemens/element-translate-ng',
81+
message:
82+
'Always use a dedicated secondary entrypoint, e.g. `@siemens/element-translate-ng/translate`.'
7883
}
7984
]
8085
}

projects/element-ng/application-header/si-account-details.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
* SPDX-License-Identifier: MIT
44
*/
55
import { ChangeDetectionStrategy, Component, input } from '@angular/core';
6-
import { SiTranslatePipe } from '@siemens/element-translate-ng';
7-
import { TranslatableString } from '@siemens/element-translate-ng/translate';
6+
import { SiTranslatePipe, TranslatableString } from '@siemens/element-translate-ng/translate';
87

98
@Component({
109
selector: 'si-account-details',

projects/maps-ng/src/components/si-map/si-map.component.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ import {
2323
Type,
2424
viewChild
2525
} from '@angular/core';
26-
import { SiNoTranslateService, SiTranslateServiceBuilder, t } from '@siemens/element-translate-ng';
26+
import {
27+
SiNoTranslateService,
28+
SiTranslateServiceBuilder,
29+
t
30+
} from '@siemens/element-translate-ng/translate';
2731
import { apply as applyMapboxStyle } from 'ol-mapbox-style';
2832
import Control from 'ol/control/Control';
2933
import { defaults as defaultControls } from 'ol/control/defaults';

src/app/examples/si-chat-messages/si-chat-message.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
import { SiIconComponent } from '@siemens/element-ng/icon';
1616
import { SiMarkdownRendererComponent } from '@siemens/element-ng/markdown-renderer';
1717
import { MenuItemAction, SiMenuFactoryComponent } from '@siemens/element-ng/menu';
18-
import { SiTranslatePipe } from '@siemens/element-translate-ng';
18+
import { SiTranslatePipe } from '@siemens/element-translate-ng/translate';
1919
import { LOG_EVENT } from '@siemens/live-preview';
2020

2121
@Component({

0 commit comments

Comments
 (0)