Skip to content

Upgrade angular to v19 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
philipsens merged 1 commit into from
Feb 7, 2025
Merged

Upgrade angular to v19 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,28 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^18.2.6",
"@angular/animations": "^19.1.4",
"@angular/cdk": "^18.2.8",
"@angular/common": "^18.2.6",
"@angular/compiler": "^18.2.6",
"@angular/core": "^18.2.6",
"@angular/forms": "^18.2.6",
"@angular/platform-browser": "^18.2.6",
"@angular/platform-browser-dynamic": "^18.2.6",
"@angular/router": "^18.2.6",
"@angular/common": "^19.1.4",
"@angular/compiler": "^19.1.4",
"@angular/core": "^19.1.4",
"@angular/forms": "^19.1.4",
"@angular/platform-browser": "^19.1.4",
"@angular/platform-browser-dynamic": "^19.1.4",
"@angular/router": "^19.1.4",
"rxjs": "~7.8.0",
"tslib": "^2.7.0",
"zone.js": "~0.14.10"
"zone.js": "~0.15.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "^18.2.6",
"@angular-devkit/build-angular": "^19.1.5",
"@angular-eslint/builder": "^18.3.1",
"@angular-eslint/eslint-plugin": "^18.3.1",
"@angular-eslint/eslint-plugin-template": "^18.3.1",
"@angular-eslint/schematics": "^18.3.1",
"@angular-eslint/template-parser": "^18.3.1",
"@angular/cli": "^18.2.6",
"@angular/compiler-cli": "^18.2.6",
"@angular/cli": "^19.1.5",
"@angular/compiler-cli": "^19.1.4",
"@types/jasmine": "~5.1.0",
"@typescript-eslint/eslint-plugin": "^8.7.0",
"@typescript-eslint/parser": "^8.7.0",
Expand All @@ -46,7 +46,7 @@
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"ng-packagr": "^18.2.1",
"ng-packagr": "^19.1.2",
"prettier": "^3.2.5",
"typescript": "~5.5.4"
},
Expand Down
4,944 changes: 2,478 additions & 2,466 deletions pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions projects/angular-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@frankframework/angular-components",
"version": "1.0.2",
"version": "1.1.0",
"description": "A collection of reusable components designed for use in Frank!Framework projects",
"main": "",
"author": "Vivy Booman",
Expand All @@ -20,7 +20,7 @@
}
},
"peerDependencies": {
"@angular/core": "^18.2.0",
"@angular/cdk": "^18.2.0"
"@angular/core": ">=18.2.0 <20.0.0",
"@angular/cdk": ">=18.2.0 <20.0.0"
}
}
3 changes: 2 additions & 1 deletion projects/angular-components/src/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "sass:meta";
@forward "./styles/_light_theme.scss";

@font-face {
Expand All @@ -17,5 +18,5 @@
}

body.ff-dark-theme {
@import "./styles/_dark_theme.scss";
@include meta.load-css("styles/_dark_theme");
}
30 changes: 15 additions & 15 deletions projects/angular-components/src/styles/_dark_theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
@import 'variables';
@use 'variables';

ff-button > button {
&:disabled {
color: $ff-color-gray;
background-color: $ff-bgcolor-dark-gray;
color: variables.$ff-color-gray;
background-color: variables.$ff-bgcolor-dark-gray;
}

&.active {
color: $ff-color-light;
background-color: $ff-bgcolor-dark-gray;
color: variables.$ff-color-light;
background-color: variables.$ff-bgcolor-dark-gray;

&:hover {
color: $ff-color-dark;
background-color: $ff-bgcolor-yellow;
color: variables.$ff-color-dark;
background-color: variables.$ff-bgcolor-yellow;
}
}
}

ff-search > label {
background-color: #000;
border: 1px solid $ff-border-gray;
border: 1px solid variables.$ff-border-gray;

&.disabled {
background-color: $ff-bgcolor-dark-gray;
background-color: variables.$ff-bgcolor-dark-gray;
}
}

$ff-alert-dark-opacity: 0.3;

ff-alert > .ff-alert {
color: $ff-color-light;
color: variables.$ff-color-light;

&.info {
background-color: hex-with-opacity($ff-alert-info, $ff-alert-dark-opacity);
background-color: variables.hex-with-opacity(variables.$ff-alert-info, $ff-alert-dark-opacity);
}

&.success {
background-color: hex-with-opacity($ff-alert-success, $ff-alert-dark-opacity);
background-color: variables.hex-with-opacity(variables.$ff-alert-success, $ff-alert-dark-opacity);
}

&.warning {
background-color: hex-with-opacity($ff-alert-warning, $ff-alert-dark-opacity);
background-color: variables.hex-with-opacity(variables.$ff-alert-warning, $ff-alert-dark-opacity);
}

&.error {
background-color: hex-with-opacity($ff-alert-error, $ff-alert-dark-opacity);
background-color: variables.hex-with-opacity(variables.$ff-alert-error, $ff-alert-dark-opacity);
}
}

ff-datatable>.dt-wrapper {
color: $ff-color-light;
color: variables.$ff-color-light;
}
78 changes: 39 additions & 39 deletions projects/angular-components/src/styles/_light_theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'variables';
@use 'variables';

ff-button *,
ff-search *,
Expand All @@ -10,107 +10,107 @@ ff-datatable * {
}

ff-button > button {
color: $ff-color-light;
background-color: $ff-bgcolor-dark-gray;
color: variables.$ff-color-light;
background-color: variables.$ff-bgcolor-dark-gray;

&:hover {
color: $ff-color-dark;
background-color: $ff-bgcolor-yellow;
color: variables.$ff-color-dark;
background-color: variables.$ff-bgcolor-yellow;
}

&:active:not(:disabled) {
color: $ff-color-dark;
background-color: $ff-bgcolor-yellow;
border: 3px solid $ff-border-yellow;
color: variables.$ff-color-dark;
background-color: variables.$ff-bgcolor-yellow;
border: 3px solid variables.$ff-border-yellow;
}

&:disabled {
color: $ff-color-gray;
background-color: $ff-bgcolor-gray;
color: variables.$ff-color-gray;
background-color: variables.$ff-bgcolor-gray;
}

&.active {
color: $ff-color-dark;
background-color: $ff-color-light;
border: 1px dashed $ff-border-gray;
color: variables.$ff-color-dark;
background-color: variables.$ff-color-light;
border: 1px dashed variables.$ff-border-gray;
gap: 8px;

&:hover {
color: $ff-color-dark;
background-color: $ff-bgcolor-yellow;
color: variables.$ff-color-dark;
background-color: variables.$ff-bgcolor-yellow;
}
}
}

ff-search > label {
color: $ff-color-gray;
background-color: $ff-bgcolor-white;
border: 1px solid $ff-bgcolor-gray;
color: variables.$ff-color-gray;
background-color: variables.$ff-bgcolor-white;
border: 1px solid variables.$ff-bgcolor-gray;

&.disabled {
background-color: $ff-bgcolor-gray;
background-color: variables.$ff-bgcolor-gray;
}

input {
color: inherit;

&::placeholder {
color: hex-with-opacity($ff-color-gray, 0.75);
color: variables.hex-with-opacity(variables.$ff-color-gray, 0.75);
}
}

kbd {
color: $ff-color-gray;
border: 1px solid $ff-border-gray;
color: variables.$ff-color-gray;
border: 1px solid variables.$ff-border-gray;
}
}

$ff-alert-light-opacity: 0.1;
$ff-alert-light-border-opacity: 0.2;

ff-alert > .ff-alert {
color: $ff-color-dark;
border: solid $ff-border-gray;
color: variables.$ff-color-dark;
border: solid variables.$ff-border-gray;

&.info {
$light-border-side: hex-with-opacity($ff-alert-info, $ff-alert-light-border-opacity);
border-color: $light-border-side $light-border-side $light-border-side $ff-alert-info;
background-color: hex-with-opacity($ff-alert-info, $ff-alert-light-opacity);
$light-border-side: variables.hex-with-opacity(variables.$ff-alert-info, $ff-alert-light-border-opacity);
border-color: $light-border-side $light-border-side $light-border-side variables.$ff-alert-info;
background-color: variables.hex-with-opacity(variables.$ff-alert-info, $ff-alert-light-opacity);
}

&.success {
$light-border-side: hex-with-opacity($ff-alert-success, $ff-alert-light-border-opacity);
border-color: $light-border-side $light-border-side $light-border-side $ff-alert-success;
background-color: hex-with-opacity($ff-alert-success, $ff-alert-light-opacity);
$light-border-side: variables.hex-with-opacity(variables.$ff-alert-success, $ff-alert-light-border-opacity);
border-color: $light-border-side $light-border-side $light-border-side variables.$ff-alert-success;
background-color: variables.hex-with-opacity(variables.$ff-alert-success, $ff-alert-light-opacity);
}

&.warning {
$light-border-side: hex-with-opacity($ff-alert-warning, $ff-alert-light-border-opacity);
border-color: $light-border-side $light-border-side $light-border-side $ff-alert-warning;
background-color: hex-with-opacity($ff-alert-warning, $ff-alert-light-opacity);
$light-border-side: variables.hex-with-opacity(variables.$ff-alert-warning, $ff-alert-light-border-opacity);
border-color: $light-border-side $light-border-side $light-border-side variables.$ff-alert-warning;
background-color: variables.hex-with-opacity(variables.$ff-alert-warning, $ff-alert-light-opacity);
}

&.error {
$light-border-side: hex-with-opacity($ff-alert-error, $ff-alert-light-border-opacity);
border-color: $light-border-side $light-border-side $light-border-side $ff-alert-error;
background-color: hex-with-opacity($ff-alert-error, $ff-alert-light-opacity);
$light-border-side: variables.hex-with-opacity(variables.$ff-alert-error, $ff-alert-light-border-opacity);
border-color: $light-border-side $light-border-side $light-border-side variables.$ff-alert-error;
background-color: variables.hex-with-opacity(variables.$ff-alert-error, $ff-alert-light-opacity);
}
}

ff-chip > span {
border: 1px solid $ff-border-gray;
border: 1px solid variables.$ff-border-gray;
}

ff-datatable > .dt-wrapper {
color: $ff-color-dark;
color: variables.$ff-color-dark;

table {
margin-top: 4px;
border-collapse: collapse;
}

& th, & td {
border: 1px solid $ff-border-gray;
border: 1px solid variables.$ff-border-gray;
border-width: 1px 0;
}
}
1 change: 0 additions & 1 deletion src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ type TableData = {

@Component({
selector: 'app-root',
standalone: true,
imports: [FormsModule, LibraryModule, SvgAddIconComponent],
templateUrl: './app.component.html',
styleUrl: './app.component.scss',
Expand Down
1 change: 0 additions & 1 deletion src/app/svg-add-icon/svg-add-icon.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { IconBaseComponent } from 'angular-components';

@Component({
selector: 'app-svg-add-icon',
standalone: true,
imports: [],
templateUrl: './svg-add-icon.component.html',
styles: `
Expand Down