Angular 18

jhipster · Jun 1, 2024 · c9fb3a2 · c9fb3a2
1 parent e10d379
commit c9fb3a2
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 29 deletions.
diff --git a/...r/client/angular/admin/src/main/webapp/app/admin/health/health.component.spec.ts.mustache b/...r/client/angular/admin/src/main/webapp/app/admin/health/health.component.spec.ts.mustache
@@ -1,8 +1,9 @@
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { HarnessLoader } from '@angular/cdk/testing';
 import { MatDialogHarness } from '@angular/material/dialog/testing';
 import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
+import { provideHttpClient } from '@angular/common/http';
 import { of } from 'rxjs';
 
 import HealthComponent from './health.component';
@@ -17,7 +18,7 @@ describe('HealthComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      providers: [provideHttpClient(), provideHttpClientTesting()],
     })
       .overrideTemplate(HealthComponent, '')
       .compileComponents();

diff --git a/...tor/client/angular/admin/src/main/webapp/app/admin/health/health.service.spec.ts.mustache b/...tor/client/angular/admin/src/main/webapp/app/admin/health/health.service.spec.ts.mustache
@@ -1,5 +1,6 @@
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 import { HealthService } from './health.service';
 import { ApplicationConfigService } from './../../config/application-config.service';
@@ -11,7 +12,7 @@ describe('HealthService Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      providers: [provideHttpClient(), provideHttpClientTesting()],
     });
 
     service = TestBed.inject(HealthService);

diff --git a/src/main/resources/generator/client/angular/core/src/main/webapp/index.html.mustache b/src/main/resources/generator/client/angular/core/src/main/webapp/index.html.mustache
@@ -11,6 +11,6 @@
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons&display=swap" rel="stylesheet">
 </head>
   <body class="mat-typography">
-    <jhi-root />
+  <jhi-root></jhi-root>
   </body>
 </html>
diff --git a/...tor/client/angular/security/jwt/src/main/webapp/app/auth/account.service.spec.ts.mustache b/...tor/client/angular/security/jwt/src/main/webapp/app/auth/account.service.spec.ts.mustache
@@ -1,6 +1,7 @@
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { provideRouter } from '@angular/router';
+import { provideHttpClient } from '@angular/common/http';
 
 import { Account } from './account.model';
 
@@ -29,8 +30,7 @@ describe('Account Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
-      providers: [provideRouter([])],
+      providers: [provideRouter([]), provideHttpClient(), provideHttpClientTesting()],
     });
 
     service = TestBed.inject(AccountService);

diff --git a/...or/client/angular/security/jwt/src/main/webapp/app/auth/auth-jwt.service.spec.ts.mustache b/...or/client/angular/security/jwt/src/main/webapp/app/auth/auth-jwt.service.spec.ts.mustache
@@ -1,5 +1,6 @@
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { AuthServerProvider } from './auth-jwt.service';
 
 describe('Auth JWT', () => {
@@ -8,7 +9,7 @@ describe('Auth JWT', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      providers: [provideHttpClient(), provideHttpClientTesting()],
     });
 
     httpMock = TestBed.inject(HttpTestingController);

diff --git a/...or/client/angular/security/jwt/src/main/webapp/app/auth/auth.interceptor.spec.ts.mustache b/...or/client/angular/security/jwt/src/main/webapp/app/auth/auth.interceptor.spec.ts.mustache
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { provideHttpClient, withInterceptors } from '@angular/common/http';
-import { HttpClientTestingModule, HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
+import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 
 import { AuthServerProvider } from './auth-jwt.service';
 import { AuthInterceptor } from './auth.interceptor';
@@ -11,7 +11,6 @@ describe('Auth Interceptor', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
       providers: [
         provideHttpClient(
           withInterceptors([AuthInterceptor])

diff --git a/...or/client/angular/security/jwt/src/main/webapp/app/login/login.component.spec.ts.mustache b/...or/client/angular/security/jwt/src/main/webapp/app/login/login.component.spec.ts.mustache
@@ -1,6 +1,7 @@
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { FormBuilder } from '@angular/forms';
+import { provideHttpClient } from '@angular/common/http';
 import { of, Subject } from 'rxjs';
 import { LoginService } from './login.service';
 import { AccountService } from '../auth/account.service';
@@ -25,8 +26,9 @@ describe('Login Component', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
       providers: [
+        provideHttpClient(),
+        provideHttpClientTesting(),
         FormBuilder,
         AccountService,
         {

diff --git a/...ator/client/angular/security/jwt/src/main/webapp/app/login/login.service.spec.ts.mustache b/...ator/client/angular/security/jwt/src/main/webapp/app/login/login.service.spec.ts.mustache
@@ -1,6 +1,7 @@
 import { provideRouter } from '@angular/router';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 import { LoginService } from './login.service';
 import { AuthServerProvider } from '../auth/auth-jwt.service';
@@ -15,8 +16,7 @@ describe('Login Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
-      providers: [AccountService, provideRouter([])],
+      providers: [AccountService, provideRouter([]), provideHttpClient(), provideHttpClientTesting()],
     });
 
     service = TestBed.inject(LoginService);

diff --git a/src/main/resources/generator/dependencies/angular/package.json b/src/main/resources/generator/dependencies/angular/package.json
@@ -1,23 +1,23 @@
 {
   "dependencies": {
-    "@angular/cdk": "17.3.9",
-    "@angular/core": "17.3.9",
-    "@angular/material": "17.3.9",
+    "@angular/cdk": "18.0.1",
+    "@angular/core": "18.0.1",
+    "@angular/material": "18.0.1",
     "keycloak-js": "24.0.4",
     "rxjs": "7.8.1",
     "tslib": "2.6.2",
     "zone.js": "0.14.6"
   },
   "devDependencies": {
-    "@angular-builders/jest": "17.0.3",
-    "@angular-devkit/build-angular": "17.3.7",
-    "@angular-eslint/builder": "17.4.1",
-    "@angular-eslint/eslint-plugin": "17.4.1",
-    "@angular-eslint/eslint-plugin-template": "17.4.1",
-    "@angular-eslint/schematics": "17.4.1",
-    "@angular-eslint/template-parser": "17.4.1",
-    "@angular/cli": "17.3.7",
-    "@angular/compiler-cli": "17.3.9",
+    "@angular-builders/jest": "18.0.0-beta.3",
+    "@angular-devkit/build-angular": "18.0.2",
+    "@angular-eslint/builder": "18.0.1",
+    "@angular-eslint/eslint-plugin": "18.0.1",
+    "@angular-eslint/eslint-plugin-template": "18.0.1",
+    "@angular-eslint/schematics": "18.0.1",
+    "@angular-eslint/template-parser": "18.0.1",
+    "@angular/cli": "18.0.2",
+    "@angular/compiler-cli": "18.0.1",
     "jest-environment-jsdom": "29.7.0",
     "jest-preset-angular": "14.1.0",
     "jest-sonar-reporter": "2.0.0"