Skip to content

Commit

Permalink
Merge branch 'main' into fix/12983
Browse files Browse the repository at this point in the history
  • Loading branch information
mikerodonnell89 authored Feb 3, 2025
2 parents 2b88591 + 14bd354 commit 332ae88
Show file tree
Hide file tree
Showing 2,020 changed files with 9,030 additions and 7,207 deletions.
1 change: 0 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@
"types": "prefer-import"
}
],
"@typescript-eslint/type-annotation-spacing": "error",
"@typescript-eslint/unified-signatures": "error",
"arrow-body-style": "error",
"arrow-parens": ["off", "always"],
Expand Down
25 changes: 17 additions & 8 deletions .github/actions/nodejs/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ inputs:
node-version:
description: Node.js version
required: false
default: 20.x
default: 22.x
frozen-lockfile:
description: Install dependencies from lock file
required: false
Expand All @@ -23,32 +23,41 @@ runs:
shell: bash
run: npm install -g corepack

- name: Enable Corepack for Yarn 4.5.1
- name: Enable Corepack for Yarn 4.6.0
shell: bash
run: |
corepack enable yarn && yarn
corepack enable yarn
- name: Install Yarn 4.5.1 (if not available)
- name: Run Yarn
shell: bash
run: |
if ! yarn --version | grep -q "4.5.1"; then
npm install -g [email protected]
yarn
- name: Install Yarn 4.6.0 (if not available)
shell: bash
run: |
if ! yarn --version | grep -q "4.6.0"; then
npm install -g [email protected]
fi
- name: Print Node.js version
shell: bash
run: node --version

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
shell: bash

- name: Use the global Yarn cache if available
uses: actions/cache@v4.1.2
uses: actions/cache@v4.2.0
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-node-${{ inputs.node_version }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-node-${{ inputs.node_version }}-yarn-
- uses: actions/cache@v4.1.2
- uses: actions/cache@v4.2.0
id: node_modules
name: Use project node_modules cache if available
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
strategy:
matrix:
agent: [1, 2, 3, 4, 5]
node-version: [22.x]
steps:
- uses: actions/[email protected]
- uses: ./.github/actions/nodejs
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/on-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
strategy:
matrix:
agent: [1, 2, 3, 4, 5, 6, 7, 8]
node-version: [22.x]
steps:
- uses: actions/[email protected]
- uses: ./.github/actions/nodejs
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.14.0
v22.12.0
32 changes: 32 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,38 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [0.55.0-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.55.0-rc.0...v0.55.0-rc.1) (2025-02-02)

**Note:** Version bump only for package fundamental-ngx





# [0.55.0-rc.0](https://github.com/SAP/fundamental-ngx/compare/v0.54.2...v0.55.0-rc.0) (2025-02-02)


### Features

* ng 19 ([#12883](https://github.com/SAP/fundamental-ngx/issues/12883)) ([2b6f375](https://github.com/SAP/fundamental-ngx/commit/2b6f375c79a0040e9564e79edb6372405e4ce878))


### BREAKING CHANGES

* angular 19





## [0.54.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.15...v0.54.2) (2025-01-31)

**Note:** Version bump only for package fundamental-ngx





## [0.54.2-rc.15](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.14...v0.54.2-rc.15) (2025-01-30)


Expand Down
4 changes: 2 additions & 2 deletions apps/docs/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"../../.eslintrc-overrides.json"
],
"rules": {
"@angular-eslint/no-host-metadata-property": "off",
"@angular-eslint/directive-selector": [
"error",
{
Expand All @@ -28,7 +27,8 @@
}
],
"jsdoc/require-jsdoc": "off",
"grouped-accessor-pairs": "off"
"grouped-accessor-pairs": "off",
"@angular-eslint/prefer-standalone": "off"
},
"plugins": ["@angular-eslint/eslint-plugin", "@typescript-eslint"]
},
Expand Down
3 changes: 1 addition & 2 deletions apps/docs/src/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { RouterOutlet } from '@angular/router';
@Component({
selector: 'app-root',
template: `<router-outlet></router-outlet>`,
imports: [RouterOutlet],
standalone: true
imports: [RouterOutlet]
})
export class AppComponent {}
6 changes: 3 additions & 3 deletions apps/docs/src/styles.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@use '@angular/cdk';
@import 'fundamental-styles/dist/info-label';
@import 'fundamental-styles/dist/form-layout-grid';
@import '@angular/cdk/overlay-prebuilt';
@import 'fundamental-styles/dist/info-label.css';
@import 'fundamental-styles/dist/form-layout-grid.css';
@import '@angular/cdk/overlay-prebuilt.css';

@include cdk.a11y-visually-hidden();

Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"packages": ["libs/*"],
"version": "0.54.2-rc.15",
"version": "0.55.0-rc.1",
"conventionalCommits": true,
"tagVersionPrefix": "v",
"message": "chore(release): publish %v",
Expand Down
2 changes: 1 addition & 1 deletion libs/btp/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"style": "kebab-case"
}
],
"@angular-eslint/no-host-metadata-property": "off"
"@angular-eslint/prefer-standalone": "off"
}
},
{
Expand Down
32 changes: 32 additions & 0 deletions libs/btp/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,38 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [0.55.0-rc.1](https://github.com/SAP/fundamental-ngx/compare/v0.55.0-rc.0...v0.55.0-rc.1) (2025-02-02)

**Note:** Version bump only for package @fundamental-ngx/btp





# [0.55.0-rc.0](https://github.com/SAP/fundamental-ngx/compare/v0.54.2...v0.55.0-rc.0) (2025-02-02)


### Features

* ng 19 ([#12883](https://github.com/SAP/fundamental-ngx/issues/12883)) ([2b6f375](https://github.com/SAP/fundamental-ngx/commit/2b6f375c79a0040e9564e79edb6372405e4ce878))


### BREAKING CHANGES

* angular 19





## [0.54.2](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.15...v0.54.2) (2025-01-31)

**Note:** Version bump only for package @fundamental-ngx/btp





## [0.54.2-rc.15](https://github.com/SAP/fundamental-ngx/compare/v0.54.2-rc.14...v0.54.2-rc.15) (2025-01-30)

**Note:** Version bump only for package @fundamental-ngx/btp
Expand Down
8 changes: 8 additions & 0 deletions libs/btp/fundamental-ngx.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { NgModule } from '@angular/core';

@NgModule({
imports: [],
declarations: [],
exports: []
})
export class FundamentalNgxBtpModule {}
13 changes: 11 additions & 2 deletions libs/btp/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,11 @@
throw new Error('Do not import anything from the `@fundamental-ngx/btp`, use secondary entrypoint exports instead!');
export default 'noop';
export * from '@fundamental-ngx/btp/button';
export * from '@fundamental-ngx/btp/navigation';
export * from '@fundamental-ngx/btp/navigation-menu';
export * from '@fundamental-ngx/btp/search-field';
export * from '@fundamental-ngx/btp/shared';
export * from '@fundamental-ngx/btp/splitter';
export * from '@fundamental-ngx/btp/tool-header';
export * from '@fundamental-ngx/btp/tool-layout';
export * from '@fundamental-ngx/core/button';
export * from '@fundamental-ngx/core/icon';
export * from './fundamental-ngx.module';
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import { fromEvent, Observable } from 'rxjs';
}
<ng-content></ng-content>
`,
standalone: true,
imports: [IconComponent],
hostDirectives: [IndirectFocusableItemDirective],
providers: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ import { NavigationMenuPopoverControlDirective } from './navigation-menu-popover
`,
styleUrls: ['./navigation-menu-popover.component.scss'],
imports: [PopoverComponent, PopoverControlComponent, PopoverBodyComponent, NgTemplateOutlet],
encapsulation: ViewEncapsulation.None,
standalone: true
encapsulation: ViewEncapsulation.None
})
export class NavigationMenuPopoverComponent {
/** @hidden */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import { NavigationListComponent } from '../navigation-list/navigation-list.comp
@Component({
selector: 'fdb-navigation-content-end',
template: `<ul fdb-navigation-list [listItems]="allListItems$()"></ul>`,
standalone: true,
imports: [NavigationListComponent, NgTemplateOutlet],
changeDetection: ChangeDetectionStrategy.OnPush,
encapsulation: ViewEncapsulation.None,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ import { FdbNavigationListItem } from '../../models/navigation-list-item.class';
import { FdbNavigation } from '../../models/navigation.class';
import { NavigationListItemComponent } from './navigation-list-item.component';

// eslint-disable-next-line @nx/enforce-module-boundaries


class NavigationComponentMock extends FdbNavigation {
closeAllPopups = new Subject<void>();
classList$ = signal([]);
Expand Down Expand Up @@ -86,3 +89,5 @@ describe('NavigationListItemComponent', () => {
expect(fixture.debugElement.query(By.directive(PopoverComponent))).toBeTruthy();
});
});


Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ export class NavigationListItemMarkerDirective implements HasElementRef {

@Component({
selector: 'fdb-navigation-list-item',
standalone: true,
imports: [
CommonModule,
NgTemplateOutlet,
Expand Down Expand Up @@ -326,21 +325,16 @@ export class NavigationListItemComponent extends FdbNavigationListItem implement
});

// We need to track child directives change and set list items based on that.
effect(
() => {
if (!this._parentNavigationListItemDirective?.childDirectives()) {
return;
}

const children = this._parentNavigationListItemDirective.childDirectives();
const mappedItems = Array.from(children).map((child) => child._item);

this.listItems$.set(mappedItems);
},
{
allowSignalWrites: true
effect(() => {
if (!this._parentNavigationListItemDirective?.childDirectives()) {
return;
}
);

const children = this._parentNavigationListItemDirective.childDirectives();
const mappedItems = Array.from(children).map((child) => child._item);

this.listItems$.set(mappedItems);
});

this._parentNavigationListItemDirective?.registerItem(this);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable @angular-eslint/no-host-metadata-property */
import { DOWN_ARROW, LEFT_ARROW, RIGHT_ARROW } from '@angular/cdk/keycodes';
import { NgTemplateOutlet } from '@angular/common';
import {
Expand Down Expand Up @@ -38,7 +37,6 @@ export class NavigationLinkRefDirective {
selector: 'a[fdb-navigation-link]',
imports: [IconComponent, NgTemplateOutlet],
hostDirectives: [RouterLinkActive],
standalone: true,
changeDetection: ChangeDetectionStrategy.OnPush,
encapsulation: ViewEncapsulation.None,
providers: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import { NavigationService } from '../../services/navigation.service';
@Component({
// eslint-disable-next-line @angular-eslint/component-selector
selector: 'ul[fdb-navigation-list]',
standalone: true,
imports: [NgTemplateOutlet],
templateUrl: './navigation-list.component.html',
encapsulation: ViewEncapsulation.None,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ export interface NavigationMoreButtonRefContext {
@Component({
// eslint-disable-next-line @angular-eslint/component-selector
selector: 'li[fdb-navigation-more-button]',
standalone: true,
imports: [
NavigationLinkComponent,
NavigationListComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,9 @@ const FD_NAVIGATION_OVERFLOW_ITEM_CLASS = 'fd-navigation__container--hidden-over
@Component({
selector: 'fdb-navigation-content-start',
templateUrl: './navigation-content-start.component.html',
standalone: true,
imports: [PortalModule, NgTemplateOutlet, NavigationListComponent, NavigationMoreButtonComponent],
changeDetection: ChangeDetectionStrategy.OnPush,
encapsulation: ViewEncapsulation.None,
// eslint-disable-next-line @angular-eslint/no-host-metadata-property
host: {
class: 'fd-navigation__container fd-navigation__container--top',
'[style.flex-grow]': '1'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'fundamental-styles/dist/navigation';
@import 'fundamental-styles/dist/navigation.css';

$block: fd-navigation;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable @angular-eslint/no-input-rename,@angular-eslint/no-host-metadata-property */
import { FocusKeyManager } from '@angular/cdk/a11y';
import { DOWN_ARROW, UP_ARROW } from '@angular/cdk/keycodes';
import { NgTemplateOutlet } from '@angular/common';
Expand Down Expand Up @@ -49,7 +48,6 @@ interface GroupedDataSourceItems {
selector: 'fdb-navigation',
templateUrl: './navigation.component.html',
styleUrls: ['./navigation.component.scss'],
standalone: true,
encapsulation: ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush,
providers: [
Expand Down
2 changes: 1 addition & 1 deletion libs/btp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fundamental-ngx/btp",
"version": "0.54.2-rc.15",
"version": "0.55.0-rc.1",
"peerDependencies": {
"@angular/common": "ANGULAR_VER_PLACEHOLDER",
"@angular/core": "ANGULAR_VER_PLACEHOLDER",
Expand Down
1 change: 0 additions & 1 deletion libs/btp/search-field/src/search-field.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import { of, tap } from 'rxjs';
selector: 'fdb-search-field',
templateUrl: './search-field.component.html',
styleUrls: ['../../../../node_modules/fundamental-styles/dist/search-field.css'],
standalone: true,
hostDirectives: [CvaDirective],
providers: [CvaControl],
imports: [IconComponent, FormsModule, FdTranslatePipe, ButtonComponent, NestedButtonDirective],
Expand Down
Loading

0 comments on commit 332ae88

Please sign in to comment.