diff --git a/libs/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.component.scss b/projects/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.component.scss
similarity index 100%
rename from libs/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.component.scss
rename to projects/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.component.scss
diff --git a/libs/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.component.spec.ts b/projects/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.component.spec.ts
similarity index 82%
rename from libs/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.component.spec.ts
rename to projects/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.component.spec.ts
index fd6da92..96ad7f3 100644
--- a/libs/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.component.spec.ts
+++ b/projects/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.component.spec.ts
@@ -1,5 +1,6 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { TofuAppLayoutComponent } from './tofu-app-layout.component';
+import {provideZonelessChangeDetection} from '@angular/core';
describe('TofuAppLayoutComponent', () => {
let component: TofuAppLayoutComponent;
@@ -7,6 +8,9 @@ describe('TofuAppLayoutComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
+ providers: [
+ provideZonelessChangeDetection()
+ ],
imports: [TofuAppLayoutComponent],
}).compileComponents();
diff --git a/libs/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.component.ts b/projects/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.component.ts
similarity index 61%
rename from libs/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.component.ts
rename to projects/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.component.ts
index 5b421b5..1fc471e 100644
--- a/libs/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.component.ts
+++ b/projects/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.component.ts
@@ -1,28 +1,24 @@
import {
Component,
- EventEmitter,
- Input,
+ Input, model,
OnDestroy,
OnInit,
- Output,
- signal,
TemplateRef,
} from '@angular/core';
-import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
-import { MatSidenavModule } from '@angular/material/sidenav';
-import { MatIconModule } from '@angular/material/icon';
-import { MatListModule } from '@angular/material/list';
-import { MatToolbarModule } from '@angular/material/toolbar';
-import { MatIconButton } from '@angular/material/button';
+import {BreakpointObserver, Breakpoints} from '@angular/cdk/layout';
+import {MatSidenavModule} from '@angular/material/sidenav';
+import {MatIconModule} from '@angular/material/icon';
+import {MatListModule} from '@angular/material/list';
+import {MatToolbarModule} from '@angular/material/toolbar';
+import {MatIconButton} from '@angular/material/button';
import {
TofuNavigationEntry,
TofuNavigationTreeComponent,
} from '../tofu-navigation-tree';
-import { RouterOutlet } from '@angular/router';
-import { NgIf } from '@angular/common';
-import { TofuAppMessagingService } from '../tofu-app-messaging';
-import { Subscription } from 'rxjs';
-import { TofuAppLayoutConsts } from './tofu-app-layout-consts';
+import {RouterOutlet} from '@angular/router';
+import {TofuAppMessagingService} from '../tofu-app-messaging';
+import {Subscription} from 'rxjs';
+import {TofuAppLayoutConsts} from './tofu-app-layout-consts';
@Component({
selector: 'tofu-app-layout',
@@ -38,22 +34,10 @@ import { TofuAppLayoutConsts } from './tofu-app-layout-consts';
MatIconButton,
RouterOutlet,
TofuNavigationTreeComponent,
- NgIf,
],
})
export class TofuAppLayoutComponent implements OnInit, OnDestroy {
- get appTitle(): string {
- return this.appTitleValue();
- }
-
- @Input()
- set appTitle(value: string) {
- this.appTitleValue.set(value);
- this.appTitleChange.emit(value);
- }
-
- @Output()
- appTitleChange = new EventEmitter
();
+ appTitle = model('');
@Input()
navEntries: TofuNavigationEntry[] = [];
@@ -73,8 +57,6 @@ export class TofuAppLayoutComponent implements OnInit, OnDestroy {
navWidth = '300px';
- protected appTitleValue = signal('');
-
private breakpointObserverSubscription: Subscription | undefined;
private appTitleSubscription: Subscription | undefined;
@@ -86,9 +68,10 @@ export class TofuAppLayoutComponent implements OnInit, OnDestroy {
}
constructor(
- private breakpointObserver: BreakpointObserver,
- private appMessagingService: TofuAppMessagingService
- ) {}
+ private readonly breakpointObserver: BreakpointObserver,
+ private readonly appMessagingService: TofuAppMessagingService
+ ) {
+ }
ngOnDestroy(): void {
this.breakpointObserverSubscription?.unsubscribe();
@@ -106,7 +89,7 @@ export class TofuAppLayoutComponent implements OnInit, OnDestroy {
this.appMessagingService.registerWithCallback(
TofuAppLayoutConsts.MSG_SET_APP_TITLE,
(title) => {
- this.appTitle = title;
+ this.appTitle.set(title);
}
);
}
diff --git a/libs/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.service.spec.ts b/projects/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.service.spec.ts
similarity index 66%
rename from libs/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.service.spec.ts
rename to projects/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.service.spec.ts
index e0008d7..8811675 100644
--- a/libs/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.service.spec.ts
+++ b/projects/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.service.spec.ts
@@ -1,12 +1,17 @@
import { TestBed } from '@angular/core/testing';
import { TofuAppLayoutService } from './tofu-app-layout.service';
+import {provideZonelessChangeDetection} from '@angular/core';
describe('TofuAppLayoutService', () => {
let service: TofuAppLayoutService;
beforeEach(() => {
- TestBed.configureTestingModule({});
+ TestBed.configureTestingModule({
+ providers: [
+ provideZonelessChangeDetection()
+ ],
+ });
service = TestBed.inject(TofuAppLayoutService);
});
diff --git a/projects/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.service.ts b/projects/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.service.ts
new file mode 100644
index 0000000..4404657
--- /dev/null
+++ b/projects/angular-tofu/src/lib/tofu-app-layout/tofu-app-layout.service.ts
@@ -0,0 +1,15 @@
+import {Injectable} from '@angular/core';
+import {TofuAppMessagingService} from '../tofu-app-messaging';
+import {TofuAppLayoutConsts} from './tofu-app-layout-consts';
+
+@Injectable({
+ providedIn: 'root',
+})
+export class TofuAppLayoutService {
+ constructor(private readonly appMessagingService: TofuAppMessagingService) {
+ }
+
+ public setAppTitle(title: string): void {
+ this.appMessagingService.send(TofuAppLayoutConsts.MSG_SET_APP_TITLE, title);
+ }
+}
diff --git a/libs/angular-tofu/src/lib/tofu-app-messaging/index.ts b/projects/angular-tofu/src/lib/tofu-app-messaging/index.ts
similarity index 100%
rename from libs/angular-tofu/src/lib/tofu-app-messaging/index.ts
rename to projects/angular-tofu/src/lib/tofu-app-messaging/index.ts
diff --git a/libs/angular-tofu/src/lib/tofu-app-messaging/tofu-app-messaging.service.spec.ts b/projects/angular-tofu/src/lib/tofu-app-messaging/tofu-app-messaging.service.spec.ts
similarity index 81%
rename from libs/angular-tofu/src/lib/tofu-app-messaging/tofu-app-messaging.service.spec.ts
rename to projects/angular-tofu/src/lib/tofu-app-messaging/tofu-app-messaging.service.spec.ts
index 36919bc..9c4996e 100644
--- a/libs/angular-tofu/src/lib/tofu-app-messaging/tofu-app-messaging.service.spec.ts
+++ b/projects/angular-tofu/src/lib/tofu-app-messaging/tofu-app-messaging.service.spec.ts
@@ -1,11 +1,16 @@
import { TestBed } from '@angular/core/testing';
import { TofuAppMessagingService } from './tofu-app-messaging.service';
+import {provideZonelessChangeDetection} from '@angular/core';
describe('TofuAppMessagingService', () => {
let service: TofuAppMessagingService;
beforeEach(() => {
- TestBed.configureTestingModule({});
+ TestBed.configureTestingModule({
+ providers: [
+ provideZonelessChangeDetection()
+ ],
+ });
service = TestBed.inject(TofuAppMessagingService);
});
@@ -34,7 +39,9 @@ describe('TofuAppMessagingService', () => {
});
it('should not execute callback after unsubscribe', () => {
- const callback = jest.fn();
+ const callback = jasmine.createSpy('callback');
+
+ //const callback = jest.fn();
const subscription = service.registerWithCallback('test', callback);
diff --git a/libs/angular-tofu/src/lib/tofu-app-messaging/tofu-app-messaging.service.ts b/projects/angular-tofu/src/lib/tofu-app-messaging/tofu-app-messaging.service.ts
similarity index 89%
rename from libs/angular-tofu/src/lib/tofu-app-messaging/tofu-app-messaging.service.ts
rename to projects/angular-tofu/src/lib/tofu-app-messaging/tofu-app-messaging.service.ts
index 94735a7..3e9641a 100644
--- a/libs/angular-tofu/src/lib/tofu-app-messaging/tofu-app-messaging.service.ts
+++ b/projects/angular-tofu/src/lib/tofu-app-messaging/tofu-app-messaging.service.ts
@@ -1,7 +1,7 @@
// noinspection JSValidateJSDoc
-import { Injectable } from '@angular/core';
-import { filter, map, Observable, Subject } from 'rxjs';
+import {Injectable} from '@angular/core';
+import {filter, map, Observable, Subject} from 'rxjs';
export interface TofuAppMessage {
type: unknown;
@@ -20,9 +20,9 @@ export interface TofuAppMessage {
providedIn: 'root',
})
export class TofuAppMessagingService {
- private messageSubject = new Subject>();
+ private readonly messageSubject = new Subject>();
- private messages$ = this.messageSubject.asObservable();
+ private readonly messages$ = this.messageSubject.asObservable();
/**
* Sends a message to the appropriate receivers.
@@ -42,7 +42,7 @@ export class TofuAppMessagingService {
* @return {void} This method does not return a value.
*/
public send(messageType: string, payload: T): void {
- this.messageSubject.next({ type: messageType, payload: payload });
+ this.messageSubject.next({type: messageType, payload: payload});
}
/**
diff --git a/libs/angular-tofu/src/lib/tofu-navigation-tree/index.ts b/projects/angular-tofu/src/lib/tofu-navigation-tree/index.ts
similarity index 100%
rename from libs/angular-tofu/src/lib/tofu-navigation-tree/index.ts
rename to projects/angular-tofu/src/lib/tofu-navigation-tree/index.ts
diff --git a/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-large-nav-tree.component.html b/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-large-nav-tree.component.html
new file mode 100644
index 0000000..6af0159
--- /dev/null
+++ b/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-large-nav-tree.component.html
@@ -0,0 +1,49 @@
+
+ @for (entry of navEntries; track entry) {
+
+ @if (entry.entries) {
+
+
+
+ } @else {
+
+
+
+ }
+
+ }
+
+
+
+
+
+ @if (item.icon) {
+ {{ item.icon }}
+ }
+ {{ item.title }}
+
+
+
+
+
+
+
+ @if (folder.icon) {
+ {{ folder.icon }}
+ }
+ {{ folder.title }}
+
+
+
+ @for (childItem of folder.entries; track childItem) {
+
+ @if (childItem.icon) {
+ {{ childItem.icon }}
+ }
+ {{ childItem.title }}
+
+ }
+
+
+
diff --git a/libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-large-nav-tree.component.scss b/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-large-nav-tree.component.scss
similarity index 100%
rename from libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-large-nav-tree.component.scss
rename to projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-large-nav-tree.component.scss
diff --git a/libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-large-nav-tree.component.spec.ts b/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-large-nav-tree.component.spec.ts
similarity index 83%
rename from libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-large-nav-tree.component.spec.ts
rename to projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-large-nav-tree.component.spec.ts
index 1aaf71c..97af62e 100644
--- a/libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-large-nav-tree.component.spec.ts
+++ b/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-large-nav-tree.component.spec.ts
@@ -1,5 +1,6 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { TofuLargeNavTreeComponent } from './tofu-large-nav-tree.component';
+import {provideZonelessChangeDetection} from '@angular/core';
describe('TofuLargeNavTreeComponent', () => {
let component: TofuLargeNavTreeComponent;
@@ -7,6 +8,9 @@ describe('TofuLargeNavTreeComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
+ providers: [
+ provideZonelessChangeDetection()
+ ],
imports: [TofuLargeNavTreeComponent],
}).compileComponents();
diff --git a/libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-large-nav-tree.component.ts b/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-large-nav-tree.component.ts
similarity index 100%
rename from libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-large-nav-tree.component.ts
rename to projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-large-nav-tree.component.ts
diff --git a/libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-entry.ts b/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-entry.ts
similarity index 100%
rename from libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-entry.ts
rename to projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-entry.ts
diff --git a/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-tree.component.html b/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-tree.component.html
new file mode 100644
index 0000000..2728973
--- /dev/null
+++ b/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-tree.component.html
@@ -0,0 +1,8 @@
+@if (hasSmallNavTree) {
+
+} @else {
+
+}
+
+
+
diff --git a/libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-tree.component.scss b/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-tree.component.scss
similarity index 100%
rename from libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-tree.component.scss
rename to projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-tree.component.scss
diff --git a/libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-tree.component.spec.ts b/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-tree.component.spec.ts
similarity index 83%
rename from libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-tree.component.spec.ts
rename to projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-tree.component.spec.ts
index 393e24c..2b2631c 100644
--- a/libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-tree.component.spec.ts
+++ b/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-tree.component.spec.ts
@@ -1,5 +1,6 @@
import {ComponentFixture, TestBed} from '@angular/core/testing';
import {TofuNavigationTreeComponent} from '../tofu-navigation-tree';
+import {provideZonelessChangeDetection} from '@angular/core';
describe('TofuNavigationTreeComponent', () => {
let component: TofuNavigationTreeComponent;
@@ -7,6 +8,9 @@ describe('TofuNavigationTreeComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
+ providers: [
+ provideZonelessChangeDetection()
+ ],
imports: [TofuNavigationTreeComponent],
}).compileComponents();
diff --git a/libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-tree.component.ts b/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-tree.component.ts
similarity index 100%
rename from libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-tree.component.ts
rename to projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-navigation-tree.component.ts
diff --git a/libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.html b/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.html
similarity index 73%
rename from libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.html
rename to projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.html
index 7b3be7d..1b91735 100644
--- a/libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.html
+++ b/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.html
@@ -1,12 +1,11 @@
-
-
+ @for (entry of navEntries; track entry) {
+ @if (entry.entries) {
-
-
+ } @else {
-
-
+ }
+ }
@@ -20,13 +19,15 @@
diff --git a/libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.scss b/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.scss
similarity index 100%
rename from libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.scss
rename to projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.scss
diff --git a/libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.spec.ts b/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.spec.ts
similarity index 83%
rename from libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.spec.ts
rename to projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.spec.ts
index 34c8295..308a42d 100644
--- a/libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.spec.ts
+++ b/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.spec.ts
@@ -1,5 +1,6 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { TofuSmallNavTreeComponent } from './tofu-small-nav-tree.component';
+import {provideZonelessChangeDetection} from '@angular/core';
describe('TofuSmallNavTreeComponent', () => {
let component: TofuSmallNavTreeComponent;
@@ -7,6 +8,9 @@ describe('TofuSmallNavTreeComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
+ providers: [
+ provideZonelessChangeDetection()
+ ],
imports: [TofuSmallNavTreeComponent],
}).compileComponents();
diff --git a/libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.ts b/projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.ts
similarity index 100%
rename from libs/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.ts
rename to projects/angular-tofu/src/lib/tofu-navigation-tree/tofu-small-nav-tree.component.ts
diff --git a/libs/angular-tofu/src/index.ts b/projects/angular-tofu/src/public-api.ts
similarity index 73%
rename from libs/angular-tofu/src/index.ts
rename to projects/angular-tofu/src/public-api.ts
index 3d1e38b..c921341 100644
--- a/libs/angular-tofu/src/index.ts
+++ b/projects/angular-tofu/src/public-api.ts
@@ -1,3 +1,7 @@
+/*
+ * Public API Surface of angular-tofu
+ */
+
export * from './lib/tofu-app-layout';
export * from './lib/tofu-navigation-tree';
diff --git a/projects/angular-tofu/tsconfig.lib.json b/projects/angular-tofu/tsconfig.lib.json
new file mode 100644
index 0000000..edb0551
--- /dev/null
+++ b/projects/angular-tofu/tsconfig.lib.json
@@ -0,0 +1,18 @@
+/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
+/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
+{
+ "extends": "../../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../../out-tsc/lib",
+ "declaration": true,
+ "declarationMap": true,
+ "inlineSources": true,
+ "types": []
+ },
+ "include": [
+ "src/**/*.ts"
+ ],
+ "exclude": [
+ "**/*.spec.ts"
+ ]
+}
diff --git a/projects/angular-tofu/tsconfig.lib.prod.json b/projects/angular-tofu/tsconfig.lib.prod.json
new file mode 100644
index 0000000..9215caa
--- /dev/null
+++ b/projects/angular-tofu/tsconfig.lib.prod.json
@@ -0,0 +1,11 @@
+/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
+/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
+{
+ "extends": "./tsconfig.lib.json",
+ "compilerOptions": {
+ "declarationMap": false
+ },
+ "angularCompilerOptions": {
+ "compilationMode": "partial"
+ }
+}
diff --git a/projects/angular-tofu/tsconfig.spec.json b/projects/angular-tofu/tsconfig.spec.json
new file mode 100644
index 0000000..077fdc2
--- /dev/null
+++ b/projects/angular-tofu/tsconfig.spec.json
@@ -0,0 +1,15 @@
+/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
+/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
+{
+ "extends": "../../tsconfig.json",
+ "compilerOptions": {
+ "outDir": "../../out-tsc/spec",
+ "types": [
+ "jasmine"
+ ]
+ },
+ "include": [
+ "src/**/*.d.ts",
+ "src/**/*.spec.ts"
+ ]
+}
diff --git a/tsconfig.base.json b/tsconfig.base.json
deleted file mode 100644
index f335579..0000000
--- a/tsconfig.base.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "compileOnSave": false,
- "compilerOptions": {
- "rootDir": ".",
- "sourceMap": true,
- "declaration": false,
- "moduleResolution": "node",
- "emitDecoratorMetadata": true,
- "experimentalDecorators": true,
- "importHelpers": true,
- "target": "es2015",
- "module": "esnext",
- "lib": ["es2020", "dom"],
- "skipLibCheck": true,
- "skipDefaultLibCheck": true,
- "baseUrl": ".",
- "paths": {
- "@cc-team/angular-tofu": ["libs/angular-tofu/src/index.ts"]
- }
- },
- "exclude": ["node_modules", "tmp"]
-}
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000..00ffd13
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,45 @@
+/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
+/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
+{
+ "compileOnSave": false,
+ "compilerOptions": {
+ "paths": {
+ "angular-tofu": [
+ "./dist/angular-tofu"
+ ]
+ },
+ "strict": true,
+ "noImplicitOverride": true,
+ "noPropertyAccessFromIndexSignature": true,
+ "noImplicitReturns": true,
+ "noFallthroughCasesInSwitch": true,
+ "skipLibCheck": true,
+ "isolatedModules": true,
+ "experimentalDecorators": true,
+ "importHelpers": true,
+ "target": "ES2022",
+ "module": "preserve"
+ },
+ "angularCompilerOptions": {
+ "enableI18nLegacyMessageIdFormat": false,
+ "strictInjectionParameters": true,
+ "strictInputAccessModifiers": true,
+ "typeCheckHostBindings": true,
+ "strictTemplates": true
+ },
+ "files": [],
+ "references": [
+ {
+ "path": "./projects/angular-tofu/tsconfig.lib.json"
+ },
+ {
+ "path": "./projects/angular-tofu/tsconfig.spec.json"
+ },
+ {
+ "path": "./projects/angular-tofu-showcase/tsconfig.app.json"
+ },
+ {
+ "path": "./projects/angular-tofu-showcase/tsconfig.spec.json"
+ }
+ ]
+}
From e0e45249d800c9b4a661c46e2fb33af96a840b4a Mon Sep 17 00:00:00 2001
From: darthsharp <48331467+darthsharp@users.noreply.github.com>
Date: Mon, 17 Nov 2025 18:30:05 +0100
Subject: [PATCH 02/14] Add logging for latest Git tag and parsed version in
action
Introduced additional log statements to output the latest Git tag and its parsed version in the `get-version-from-git` action, improving traceability and debugging.
---
.github/workflows/actions/get-version-from-git/action.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/workflows/actions/get-version-from-git/action.yml b/.github/workflows/actions/get-version-from-git/action.yml
index 64c3414..ba7423d 100644
--- a/.github/workflows/actions/get-version-from-git/action.yml
+++ b/.github/workflows/actions/get-version-from-git/action.yml
@@ -15,8 +15,10 @@ runs:
# Get latest tag
latest_tag=$(git describe --tags --abbrev=0 2>/dev/null || echo "v0.0.0")
+ echo "latest_tag=${latest_tag}"
# Remove 'v' prefix if present
version=${latest_tag#v}
+ echo "version=${version}"
IFS='.' read -r -a VERSION_PARTS <<< "$version"
BUILD_RUN=${{ github.run_number }}
From 26dff2808307a996cfa95780f502e2914ae3939e Mon Sep 17 00:00:00 2001
From: darthsharp <48331467+darthsharp@users.noreply.github.com>
Date: Mon, 17 Nov 2025 18:33:43 +0100
Subject: [PATCH 03/14] Fix handling of two-part version strings in
`get-version-from-git` action
Updated versioning logic to correctly increment the build number for two-part versions (`x.y`) instead of requiring three parts (`x.y.z`). Added an error check for invalid formats.
---
.github/workflows/actions/get-version-from-git/action.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/actions/get-version-from-git/action.yml b/.github/workflows/actions/get-version-from-git/action.yml
index ba7423d..ec248a9 100644
--- a/.github/workflows/actions/get-version-from-git/action.yml
+++ b/.github/workflows/actions/get-version-from-git/action.yml
@@ -24,8 +24,8 @@ runs:
BUILD_RUN=${{ github.run_number }}
# Increment the patch version
- if [ ${#VERSION_PARTS[@]} -eq 3 ]; then
- version="${VERSION_PARTS[0]}.${VERSION_PARTS[1]}.${VERSION_PARTS[2]}.$BUILD_RUN"
+ if [ ${#VERSION_PARTS[@]} -eq 2 ]; then
+ version="${VERSION_PARTS[0]}.${VERSION_PARTS[1]}.$BUILD_RUN"
else
echo "Error: Invalid version format. Expected 'x.y.z'."
exit 1
From 1ff350e9a3d3a98f06e2f904bb76d38fab82a494 Mon Sep 17 00:00:00 2001
From: darthsharp <48331467+darthsharp@users.noreply.github.com>
Date: Mon, 17 Nov 2025 18:39:48 +0100
Subject: [PATCH 04/14] Add prerelease suffix for non-main branches in
`get-version-from-git` action
Modified the `get-version-from-git` action to append `-prerelease` to the version for branches other than `main`. This ensures version clarity for prerelease builds.
---
.github/workflows/actions/get-version-from-git/action.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.github/workflows/actions/get-version-from-git/action.yml b/.github/workflows/actions/get-version-from-git/action.yml
index ec248a9..c886704 100644
--- a/.github/workflows/actions/get-version-from-git/action.yml
+++ b/.github/workflows/actions/get-version-from-git/action.yml
@@ -31,6 +31,11 @@ runs:
exit 1
fi
+ current_branch=$(git branch --show-current)
+ if [ "$current_branch" != "main" ]; then
+ version="${version}-prerelease"
+ fi
+
echo "version=${version}"
echo "version=${version}" >> $GITHUB_OUTPUT
From 514c482be84a3395f45ab144566dc8044e854f0a Mon Sep 17 00:00:00 2001
From: darthsharp <48331467+darthsharp@users.noreply.github.com>
Date: Mon, 17 Nov 2025 18:44:09 +0100
Subject: [PATCH 05/14] Update `get-version-from-git` action to count commits
since the last tag
Added logic to calculate the number of commits since the latest Git tag and use this count for the patch version in two-part version strings. This improves versioning accuracy for incremental builds.
---
.github/workflows/actions/get-version-from-git/action.yml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/actions/get-version-from-git/action.yml b/.github/workflows/actions/get-version-from-git/action.yml
index c886704..b7c99a3 100644
--- a/.github/workflows/actions/get-version-from-git/action.yml
+++ b/.github/workflows/actions/get-version-from-git/action.yml
@@ -23,9 +23,12 @@ runs:
IFS='.' read -r -a VERSION_PARTS <<< "$version"
BUILD_RUN=${{ github.run_number }}
+ commitCountSinceTag=$(git rev-list --count ${latest_tag}..HEAD 2>/dev/null || echo 0)
+ echo "commitCountSinceTag=${commitCountSinceTag}"
+
# Increment the patch version
if [ ${#VERSION_PARTS[@]} -eq 2 ]; then
- version="${VERSION_PARTS[0]}.${VERSION_PARTS[1]}.$BUILD_RUN"
+ version="${VERSION_PARTS[0]}.${VERSION_PARTS[1]}.commitCountSinceTag"
else
echo "Error: Invalid version format. Expected 'x.y.z'."
exit 1
From ebad49c952c6fcbf20c427d3b8e7aff010b79c21 Mon Sep 17 00:00:00 2001
From: darthsharp <48331467+darthsharp@users.noreply.github.com>
Date: Mon, 17 Nov 2025 18:47:09 +0100
Subject: [PATCH 06/14] Fix variable reference in `get-version-from-git` action
Corrected the variable name for `commitCountSinceTag` in the two-part version logic to ensure proper version computation.
---
.github/workflows/actions/get-version-from-git/action.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/actions/get-version-from-git/action.yml b/.github/workflows/actions/get-version-from-git/action.yml
index b7c99a3..f6621c1 100644
--- a/.github/workflows/actions/get-version-from-git/action.yml
+++ b/.github/workflows/actions/get-version-from-git/action.yml
@@ -28,7 +28,7 @@ runs:
# Increment the patch version
if [ ${#VERSION_PARTS[@]} -eq 2 ]; then
- version="${VERSION_PARTS[0]}.${VERSION_PARTS[1]}.commitCountSinceTag"
+ version="${VERSION_PARTS[0]}.${VERSION_PARTS[1]}.${commitCountSinceTag}"
else
echo "Error: Invalid version format. Expected 'x.y.z'."
exit 1
From d0eca237fbd4e8e6884a193618ec678b015d03fa Mon Sep 17 00:00:00 2001
From: darthsharp <48331467+darthsharp@users.noreply.github.com>
Date: Fri, 21 Nov 2025 16:20:55 +0100
Subject: [PATCH 07/14] Update CI workflow to build and test Angular projects
Replaced unused script with explicit build steps for `angular-tofu` and `angular-tofu-showcase`. Added a new step for running unit tests in headless Chrome with code coverage enabled.
---
.github/workflows/integration.yml | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index e64c230..f16f134 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -29,5 +29,13 @@ jobs:
- uses: ./.github/workflows/actions/get-version-from-git
- - run: |
- #bash ./build.sh nxTargets
+ - name: Build projects
+ run: |
+ npm run build angular-tofu
+ npm run build angular-tofu-showcase
+
+ - name: Run unit tests (headless)
+ env:
+ CI: 'true'
+ run: |
+ npm run test -- --watch=false --browsers=ChromeHeadless --code-coverage
From 34103057a6bb43b616c15078d170ad1bc7b09736 Mon Sep 17 00:00:00 2001
From: darthsharp <48331467+darthsharp@users.noreply.github.com>
Date: Sun, 23 Nov 2025 15:44:49 +0100
Subject: [PATCH 08/14] Add `MoreComponent` and provide zoneless change
detection
Introduced a new `MoreComponent` with its template, styles, and spec file. Integrated `provideZonelessChangeDetection` into tests and updated routing to include `MoreComponent`. Commented unused code in `AboutComponent`.
---
.../src/app/about/about.component.html | 2 --
.../src/app/about/about.component.spec.ts | 9 +++++--
.../src/app/about/about.component.ts | 14 ++--------
.../src/app/app.config.ts | 3 ++-
.../src/app/app.routes.ts | 3 ++-
.../angular-tofu-showcase/src/app/app.spec.ts | 9 ++++---
.../app/main-view/main-view.component.spec.ts | 8 ++++--
.../app/more-component/more-component.html | 1 +
.../app/more-component/more-component.scss | 0
.../app/more-component/more-component.spec.ts | 27 +++++++++++++++++++
.../src/app/more-component/more-component.ts | 11 ++++++++
.../settings-view.component.spec.ts | 8 ++++--
12 files changed, 69 insertions(+), 26 deletions(-)
create mode 100644 projects/angular-tofu-showcase/src/app/more-component/more-component.html
create mode 100644 projects/angular-tofu-showcase/src/app/more-component/more-component.scss
create mode 100644 projects/angular-tofu-showcase/src/app/more-component/more-component.spec.ts
create mode 100644 projects/angular-tofu-showcase/src/app/more-component/more-component.ts
diff --git a/projects/angular-tofu-showcase/src/app/about/about.component.html b/projects/angular-tofu-showcase/src/app/about/about.component.html
index 309c530..6094aa9 100644
--- a/projects/angular-tofu-showcase/src/app/about/about.component.html
+++ b/projects/angular-tofu-showcase/src/app/about/about.component.html
@@ -1,3 +1 @@
about works!
-
-{{ appTitle() }}
diff --git a/projects/angular-tofu-showcase/src/app/about/about.component.spec.ts b/projects/angular-tofu-showcase/src/app/about/about.component.spec.ts
index 79f40f9..d05d8f2 100644
--- a/projects/angular-tofu-showcase/src/app/about/about.component.spec.ts
+++ b/projects/angular-tofu-showcase/src/app/about/about.component.spec.ts
@@ -1,5 +1,7 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { AboutComponent } from './about.component';
+import {ComponentFixture, TestBed} from '@angular/core/testing';
+import {AboutComponent} from './about.component';
+import {provideZonelessChangeDetection} from "@angular/core";
+import {App} from "../app";
describe('AboutComponent', () => {
let component: AboutComponent;
@@ -8,6 +10,9 @@ describe('AboutComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [AboutComponent],
+ providers: [
+ provideZonelessChangeDetection()
+ ],
}).compileComponents();
fixture = TestBed.createComponent(AboutComponent);
diff --git a/projects/angular-tofu-showcase/src/app/about/about.component.ts b/projects/angular-tofu-showcase/src/app/about/about.component.ts
index 0b9f103..b3110ea 100644
--- a/projects/angular-tofu-showcase/src/app/about/about.component.ts
+++ b/projects/angular-tofu-showcase/src/app/about/about.component.ts
@@ -1,6 +1,5 @@
-import {Component, model, OnInit} from '@angular/core';
+import {Component} from '@angular/core';
import {CommonModule} from '@angular/common';
-import {App} from '../app';
@Component({
selector: 'app-about',
@@ -8,15 +7,6 @@ import {App} from '../app';
templateUrl: './about.component.html',
styleUrl: './about.component.scss',
})
-export class AboutComponent implements OnInit {
- appTitle = model('');
-
- constructor(private readonly app: App) {
- }
-
- ngOnInit(): void {
- this.appTitle.set(this.app.title());
- }
-
+export class AboutComponent {
}
diff --git a/projects/angular-tofu-showcase/src/app/app.config.ts b/projects/angular-tofu-showcase/src/app/app.config.ts
index 4bd1cc4..3938b3c 100644
--- a/projects/angular-tofu-showcase/src/app/app.config.ts
+++ b/projects/angular-tofu-showcase/src/app/app.config.ts
@@ -1,6 +1,7 @@
import {
ApplicationConfig,
- provideBrowserGlobalErrorListeners, provideZonelessChangeDetection
+ provideBrowserGlobalErrorListeners,
+ provideZonelessChangeDetection
} from '@angular/core';
import {provideRouter} from '@angular/router';
import {appRoutes} from './app.routes';
diff --git a/projects/angular-tofu-showcase/src/app/app.routes.ts b/projects/angular-tofu-showcase/src/app/app.routes.ts
index 7e62cc1..30f49c1 100644
--- a/projects/angular-tofu-showcase/src/app/app.routes.ts
+++ b/projects/angular-tofu-showcase/src/app/app.routes.ts
@@ -2,6 +2,7 @@ import {Route} from '@angular/router';
import {MainViewComponent} from './main-view/main-view.component';
import {AboutComponent} from './about/about.component';
import {SettingsViewComponent} from './settings-view/settings-view.component';
+import {MoreComponent} from "./more-component/more-component";
export const appRoutes: Route[] = [
{
@@ -18,6 +19,6 @@ export const appRoutes: Route[] = [
},
{
path: 'about2',
- component: AboutComponent,
+ component: MoreComponent,
},
];
diff --git a/projects/angular-tofu-showcase/src/app/app.spec.ts b/projects/angular-tofu-showcase/src/app/app.spec.ts
index a49a347..30f0842 100644
--- a/projects/angular-tofu-showcase/src/app/app.spec.ts
+++ b/projects/angular-tofu-showcase/src/app/app.spec.ts
@@ -1,6 +1,6 @@
-import { TestBed } from '@angular/core/testing';
-import { App } from './app';
-import { RouterModule } from '@angular/router';
+import {TestBed} from '@angular/core/testing';
+import {App} from './app';
+import {RouterModule} from '@angular/router';
import {provideZonelessChangeDetection} from '@angular/core';
describe('AppComponent', () => {
@@ -15,7 +15,8 @@ describe('AppComponent', () => {
it(`should have as title 'angular-tofu-showcase'`, () => {
const fixture = TestBed.createComponent(App);
+ fixture.detectChanges();
const app = fixture.componentInstance;
- expect(app.title).toEqual('Angular Tofu Showcase');
+ expect(app.title()).toEqual('Angular Tofu Showcase');
});
});
diff --git a/projects/angular-tofu-showcase/src/app/main-view/main-view.component.spec.ts b/projects/angular-tofu-showcase/src/app/main-view/main-view.component.spec.ts
index cf0d5e8..06b8fb3 100644
--- a/projects/angular-tofu-showcase/src/app/main-view/main-view.component.spec.ts
+++ b/projects/angular-tofu-showcase/src/app/main-view/main-view.component.spec.ts
@@ -1,5 +1,6 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MainViewComponent } from './main-view.component';
+import {ComponentFixture, TestBed} from '@angular/core/testing';
+import {MainViewComponent} from './main-view.component';
+import {provideZonelessChangeDetection} from "@angular/core";
describe('MainViewComponent', () => {
let component: MainViewComponent;
@@ -8,6 +9,9 @@ describe('MainViewComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [MainViewComponent],
+ providers: [
+ provideZonelessChangeDetection()
+ ],
}).compileComponents();
fixture = TestBed.createComponent(MainViewComponent);
diff --git a/projects/angular-tofu-showcase/src/app/more-component/more-component.html b/projects/angular-tofu-showcase/src/app/more-component/more-component.html
new file mode 100644
index 0000000..0397ebf
--- /dev/null
+++ b/projects/angular-tofu-showcase/src/app/more-component/more-component.html
@@ -0,0 +1 @@
+more-component works!
diff --git a/projects/angular-tofu-showcase/src/app/more-component/more-component.scss b/projects/angular-tofu-showcase/src/app/more-component/more-component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/projects/angular-tofu-showcase/src/app/more-component/more-component.spec.ts b/projects/angular-tofu-showcase/src/app/more-component/more-component.spec.ts
new file mode 100644
index 0000000..f3c6d02
--- /dev/null
+++ b/projects/angular-tofu-showcase/src/app/more-component/more-component.spec.ts
@@ -0,0 +1,27 @@
+import {ComponentFixture, TestBed} from '@angular/core/testing';
+
+import {MoreComponent} from './more-component';
+import {provideZonelessChangeDetection} from "@angular/core";
+
+describe('MoreComponent', () => {
+ let component: MoreComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ imports: [MoreComponent],
+ providers: [
+ provideZonelessChangeDetection()
+ ],
+ })
+ .compileComponents();
+
+ fixture = TestBed.createComponent(MoreComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/projects/angular-tofu-showcase/src/app/more-component/more-component.ts b/projects/angular-tofu-showcase/src/app/more-component/more-component.ts
new file mode 100644
index 0000000..735b5a5
--- /dev/null
+++ b/projects/angular-tofu-showcase/src/app/more-component/more-component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'ats-more-component',
+ imports: [],
+ templateUrl: './more-component.html',
+ styleUrl: './more-component.scss',
+})
+export class MoreComponent {
+
+}
diff --git a/projects/angular-tofu-showcase/src/app/settings-view/settings-view.component.spec.ts b/projects/angular-tofu-showcase/src/app/settings-view/settings-view.component.spec.ts
index 59f947f..1236fa0 100644
--- a/projects/angular-tofu-showcase/src/app/settings-view/settings-view.component.spec.ts
+++ b/projects/angular-tofu-showcase/src/app/settings-view/settings-view.component.spec.ts
@@ -1,5 +1,6 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { SettingsViewComponent } from './settings-view.component';
+import {ComponentFixture, TestBed} from '@angular/core/testing';
+import {SettingsViewComponent} from './settings-view.component';
+import {provideZonelessChangeDetection} from "@angular/core";
describe('SettingsViewComponent', () => {
let component: SettingsViewComponent;
@@ -8,6 +9,9 @@ describe('SettingsViewComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [SettingsViewComponent],
+ providers: [
+ provideZonelessChangeDetection()
+ ],
}).compileComponents();
fixture = TestBed.createComponent(SettingsViewComponent);
From 50baea797f4c0f085b61c512cbbd7de57d2d6545 Mon Sep 17 00:00:00 2001
From: darthsharp <48331467+darthsharp@users.noreply.github.com>
Date: Mon, 24 Nov 2025 15:18:44 +0100
Subject: [PATCH 09/14] Refactor workflows to modularize build steps with
reusable actions
Extracted build logic into a reusable `build-projects` action. Updated existing workflows (`release`, `main`, and `integration`) to use this action, improving maintainability and consistency.
---
.../actions/build-projects/action.yml | 27 +++++++++++++++++++
.github/workflows/integration.yml | 7 +++--
.github/workflows/main.yml | 18 ++++++++-----
.github/workflows/release.yml | 25 +++++++++++++----
4 files changed, 62 insertions(+), 15 deletions(-)
create mode 100644 .github/workflows/actions/build-projects/action.yml
diff --git a/.github/workflows/actions/build-projects/action.yml b/.github/workflows/actions/build-projects/action.yml
new file mode 100644
index 0000000..2550647
--- /dev/null
+++ b/.github/workflows/actions/build-projects/action.yml
@@ -0,0 +1,27 @@
+name: Build Projects
+
+inputs:
+ version:
+ description: 'The version to build'
+ required: true
+
+runs:
+ using: 'composite'
+ steps:
+ - id: get-version
+ shell: bash
+ run: |
+ VERSION="${{ inputs.version }}"
+ echo "Building projects with version: $VERSION"
+
+ ROOT_DIR=$(pwd)
+ cd projects/angular-tofu
+
+ # Set the version in package.json files
+ npm version "$VERSION" --no-git-tag-version
+
+ cd "$ROOT_DIR"
+
+ npm run build angular-tofu
+ npm run build angular-tofu-showcase
+
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index f16f134..98d89f4 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -19,7 +19,6 @@ jobs:
fetch-depth: 0
fetch-tags: 'true'
- # Cache node_modules
- uses: actions/setup-node@v4
with:
node-version: 24
@@ -30,9 +29,9 @@ jobs:
- uses: ./.github/workflows/actions/get-version-from-git
- name: Build projects
- run: |
- npm run build angular-tofu
- npm run build angular-tofu-showcase
+ uses: ./.github/workflows/actions/build-projects
+ with:
+ version: ${{ steps.get-version.outputs.version }}
- name: Run unit tests (headless)
env:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 24b67bc..add0159 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,12 +25,18 @@ jobs:
cache: 'npm'
- run: npm ci --legacy-peer-deps
- - uses: nrwl/nx-set-shas@v4
- - name: Publish to npm
- if: github.ref == 'refs/heads/main' # Nur auf dem main-Branch
- run: |
- #bash ./build.sh nxTargets
+ - uses: ./.github/workflows/actions/get-version-from-git
+ id: get-version
+
+ - name: Build projects
+ uses: ./.github/workflows/actions/build-projects
+ with:
+ version: ${{ steps.get-version.outputs.version }}
+ - name: Run unit tests (headless)
env:
- NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} # NPM-Token aus GitHub Secrets
+ CI: 'true'
+ run: |
+ npm run test -- --watch=false --browsers=ChromeHeadless --code-coverage
+
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 46c19e3..0bc7fd2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,7 +19,6 @@ jobs:
fetch-depth: 0
fetch-tags: 'true'
- # Cache node_modules
- uses: actions/setup-node@v4
with:
node-version: 24
@@ -27,9 +26,25 @@ jobs:
registry-url: https://registry.npmjs.org/
- run: npm ci --legacy-peer-deps
- - run: npx playwright install --with-deps
- - name: Publish to npm
+
+ - uses: ./.github/workflows/actions/get-version-from-git
+ id: get-version
+
+ - name: Build projects
+ uses: ./.github/workflows/actions/build-projects
+ with:
+ version: ${{ steps.get-version.outputs.version }}
+
+ - name: Run unit tests (headless)
+ env:
+ CI: 'true'
run: |
- bash ./build.sh publishNpmPackage
+ npm run test -- --watch=false --browsers=ChromeHeadless --code-coverage
+
+ - name: Publish angular-tofu library to NPM
env:
- NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} # NPM-Token aus GitHub Secrets
+ NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+ run: |
+ cd dist/angular-tofu
+
+ npm publish --access public
From 44dcfa10911887a1e3e22fee28aea0bbf5226a0e Mon Sep 17 00:00:00 2001
From: darthsharp <48331467+darthsharp@users.noreply.github.com>
Date: Mon, 24 Nov 2025 15:22:10 +0100
Subject: [PATCH 10/14] Add `id` to `get-version-from-git` step in integration
workflow
---
.github/workflows/integration.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 98d89f4..e7b0c4d 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -27,6 +27,7 @@ jobs:
- run: npm ci --legacy-peer-deps
- uses: ./.github/workflows/actions/get-version-from-git
+ id: get-version
- name: Build projects
uses: ./.github/workflows/actions/build-projects
From d7f985848a7697a67dc546173e98aba4e6acb83c Mon Sep 17 00:00:00 2001
From: darthsharp <48331467+darthsharp@users.noreply.github.com>
Date: Mon, 24 Nov 2025 15:27:42 +0100
Subject: [PATCH 11/14] Add logging for version and build initiation in
`build-projects` action
---
.github/workflows/actions/build-projects/action.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.github/workflows/actions/build-projects/action.yml b/.github/workflows/actions/build-projects/action.yml
index 2550647..068a866 100644
--- a/.github/workflows/actions/build-projects/action.yml
+++ b/.github/workflows/actions/build-projects/action.yml
@@ -22,6 +22,10 @@ runs:
cd "$ROOT_DIR"
+ echo "Version set to:"
+ cat dist/angular-tofu/package.json | jq '.version'
+
+ echo "Building projects..."
npm run build angular-tofu
npm run build angular-tofu-showcase
From 988cef15a90cef64066262046b3bae31d44d1c46 Mon Sep 17 00:00:00 2001
From: darthsharp <48331467+darthsharp@users.noreply.github.com>
Date: Mon, 24 Nov 2025 15:28:54 +0100
Subject: [PATCH 12/14] Fix incorrect path to `package.json` in
`build-projects` action
---
.github/workflows/actions/build-projects/action.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/actions/build-projects/action.yml b/.github/workflows/actions/build-projects/action.yml
index 068a866..4fd0d45 100644
--- a/.github/workflows/actions/build-projects/action.yml
+++ b/.github/workflows/actions/build-projects/action.yml
@@ -23,7 +23,7 @@ runs:
cd "$ROOT_DIR"
echo "Version set to:"
- cat dist/angular-tofu/package.json | jq '.version'
+ cat ./dist/angular-tofu/package.json | jq '.version'
echo "Building projects..."
npm run build angular-tofu
From f7156a59546491155dfbf2828b4661319eb5f5a3 Mon Sep 17 00:00:00 2001
From: darthsharp <48331467+darthsharp@users.noreply.github.com>
Date: Mon, 24 Nov 2025 15:30:22 +0100
Subject: [PATCH 13/14] Add logging for angular-tofu library version in
`build-projects` action
---
.github/workflows/actions/build-projects/action.yml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/actions/build-projects/action.yml b/.github/workflows/actions/build-projects/action.yml
index 4fd0d45..93a8754 100644
--- a/.github/workflows/actions/build-projects/action.yml
+++ b/.github/workflows/actions/build-projects/action.yml
@@ -22,10 +22,9 @@ runs:
cd "$ROOT_DIR"
- echo "Version set to:"
- cat ./dist/angular-tofu/package.json | jq '.version'
-
echo "Building projects..."
npm run build angular-tofu
npm run build angular-tofu-showcase
+ echo "angular-tofu library version set to:"
+ cat ./dist/angular-tofu/package.json | jq '.version'
From 6f65b1466f62ccb8854a57361300752b96d0818d Mon Sep 17 00:00:00 2001
From: darthsharp <48331467+darthsharp@users.noreply.github.com>
Date: Mon, 24 Nov 2025 15:47:48 +0100
Subject: [PATCH 14/14] Comment out `npm publish` step in `release` workflow
---
.github/workflows/release.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0bc7fd2..a8ff5da 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -47,4 +47,4 @@ jobs:
run: |
cd dist/angular-tofu
- npm publish --access public
+ #npm publish --access public
