Skip to content

Commit

Permalink
Merge pull request #26213 from jhipster/angular-18
Browse files Browse the repository at this point in the history
Upgrade to Angular 18
  • Loading branch information
DanielFran committed Jun 17, 2024
2 parents a794443 + 6273885 commit bea53f8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
24 changes: 12 additions & 12 deletions generators/angular/resources/package.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
{
"dependencies": {
"@angular/common": "17.3.9",
"@fortawesome/angular-fontawesome": "0.14.1",
"@angular/common": "18.0.3",
"@fortawesome/angular-fontawesome": "0.15.0",
"@fortawesome/fontawesome-svg-core": "6.5.2",
"@fortawesome/free-solid-svg-icons": "6.5.2",
"@ng-bootstrap/ng-bootstrap": "16.0.0",
"@ng-bootstrap/ng-bootstrap": "17.0.0",
"@ngx-translate/core": "15.0.0",
"@ngx-translate/http-loader": "8.0.0",
"@popperjs/core": "2.11.8",
"@stomp/rx-stomp": "2.0.0",
"bootstrap": "5.3.3",
"bootswatch": "5.3.3",
"ngx-cookie-service": "17.1.0",
"ngx-infinite-scroll": "17.0.0",
"ngx-cookie-service": "18.0.0",
"ngx-infinite-scroll": "18.0.0",
"rxjs": "7.8.1",
"sockjs-client": "1.6.1",
"tslib": "2.6.3",
"zone.js": "0.14.6"
"zone.js": "0.14.7"
},
"devDependencies": {
"@angular-architects/module-federation": "17.0.8",
"@angular-architects/module-federation-runtime": "17.0.8",
"@angular-builders/custom-webpack": "17.0.2",
"@angular-builders/jest": "17.0.3",
"@angular-eslint/eslint-plugin": "17.5.2",
"@angular/cli": "17.3.7",
"@angular-architects/module-federation": "18.0.2",
"@angular-architects/module-federation-runtime": "18.0.2",
"@angular-builders/custom-webpack": "18.0.0",
"@angular-builders/jest": "18.0.0",
"@angular-eslint/eslint-plugin": "18.0.1",
"@angular/cli": "18.0.4",
"@types/jest": "29.5.12",
"@types/node": "20.11.25",
"@types/sockjs-client": "1.5.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<div class="d-flex justify-content-end">
<button class="btn btn-info me-2" (click)="loadAll()" [disabled]="isLoading()">
<fa-icon icon="sync" [spin]="isLoading()"></fa-icon>
<fa-icon icon="sync" [animation]="isLoading() ? 'spin' : undefined"></fa-icon>
<span>__jhiTranslateTag__('userManagement.home.refreshListLabel')</span>
</button>
<button class="btn btn-primary jh-create-entity" [routerLink]="['./new']">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<div class="d-flex justify-content-end">
<button class="btn btn-info me-2" (click)="load()" [disabled]="isLoading">
<fa-icon icon="sync" [spin]="isLoading"></fa-icon>
<fa-icon icon="sync" [animation]="isLoading ? 'spin' : undefined"></fa-icon>
<span>__jhiTranslateTag__('<%- i18nKeyPrefix %>.home.refreshListLabel')</span>
</button>
<%_ if (!readOnly) { _%>
Expand Down

0 comments on commit bea53f8

Please sign in to comment.