@eui/cli 18.0.1 → 18.0.2-snapshot-1718177856730

package/.version.properties

@@ -1 +1 @@
-18.0.1
+18.0.2-snapshot-1718177856730

package/lib/skeletons/_angular/base/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "18.0.1",
+    "version": "18.0.2-snapshot-1718177856730",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -20,7 +20,7 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "18.0.1"
+        "@eui/deps-base": "18.0.2-snapshot-1718177856730"
     },
     "resolutions": {
         "js-yaml": ">=3.13.1",

package/lib/skeletons/_angular/base/src/app/app-starter.service.spec.ts

@@ -1,10 +1,12 @@
 import {TestBed} from '@angular/core/testing';
-import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
+import { HttpTestingController, provideHttpClientTesting } from "@angular/common/http/testing";
 import {CONFIG_TOKEN, I18nService, UserService} from '@eui/core';
 import {EuiAppConfig} from '@eui/core';
 import {of} from 'rxjs';
 import {AppStarterService} from './app-starter.service';
 import SpyObj = jasmine.SpyObj;
+import { EuiServiceStatus } from '@eui/base';
+import { provideHttpClient, withInterceptorsFromDi } from "@angular/common/http";
 
 describe('AppStarterService', () => {
     let service: AppStarterService;
@@ -19,8 +21,9 @@ describe('AppStarterService', () => {
         configMock = {global: {}, modules: {core: {base: 'localhost:3000', userDetails: 'dummy'}}};
 
         TestBed.configureTestingModule({
-            imports: [HttpClientTestingModule],
             providers: [
+                provideHttpClient(withInterceptorsFromDi()),
+                provideHttpClientTesting(),
                 AppStarterService,
                 {provide: UserService, useValue: userServiceMock},
                 {provide: I18nService, useValue: i18nServiceMock},
@@ -37,8 +40,8 @@ describe('AppStarterService', () => {
     });
 
     it('should call start method', () => {
-        userServiceMock.init.and.returnValue(of(null));
-        i18nServiceMock.init.and.returnValue(of(null));
+        userServiceMock.init.and.returnValue(of({ } as EuiServiceStatus));
+        i18nServiceMock.init.and.returnValue(of({ } as EuiServiceStatus));
         service.start().subscribe(() => {
             expect(userServiceMock.init).toHaveBeenCalled();
             expect(i18nServiceMock.init).toHaveBeenCalled();
@@ -46,7 +49,7 @@ describe('AppStarterService', () => {
     });
 
     it('should call initUserService method', () => {
-        userServiceMock.init.and.returnValue(of(null));
+        userServiceMock.init.and.returnValue(of({ } as EuiServiceStatus));
         service.initUserService().subscribe(() => {
             expect(userServiceMock.init).toHaveBeenCalled();
         });
@@ -58,7 +61,7 @@ describe('AppStarterService', () => {
             expect(userDetails).toEqual(dummyUserDetails);
         });
 
-        const req = httpMock.expectOne(`${configMock.modules.core.base}${configMock.modules.core.userDetails}`);
+        const req = httpMock.expectOne(`${configMock.modules?.['core']['base']}${configMock.modules?.['core']['userDetails']}`);
         expect(req.request.method).toBe('GET');
         req.flush(dummyUserDetails);
     });

package/lib/skeletons/_angular/base/src/app/app-starter.service.ts

@@ -1,15 +1,13 @@
 import { Inject, Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
 import {
     CONFIG_TOKEN,
     UserService,
     I18nService,
-} from '@eui/core';
-import {
     EuiAppConfig,
     UserDetails,
     UserPreferences,
 } from '@eui/core';
-import { HttpClient } from '@angular/common/http';
 import { Observable, of, zip } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 
@@ -17,7 +15,7 @@ import { switchMap } from 'rxjs/operators';
     providedIn: 'root',
 })
 export class AppStarterService {
-    defaultUserPreferences: UserPreferences;
+    defaultUserPreferences: UserPreferences | undefined;
 
     constructor(
         protected userService: UserService,
@@ -58,8 +56,8 @@ export class AppStarterService {
      */
     private fetchUserDetails(): Observable<UserDetails> {
         // const url = this.config.modules.your_custom_module.your_custom_endpoint
-        const moduleCoreApi = this.config.modules.core;
-        const url = `${moduleCoreApi.base}${moduleCoreApi.userDetails}`;
+        const moduleCoreApi= this.config.modules?.['core'];
+        const url = `${moduleCoreApi?.['base']}${moduleCoreApi?.['userDetails']}`;
         const user = { userId: 'anonymous' };
 
         if (!url) {

package/lib/skeletons/_angular/base/src/app/app.component.spec.ts

@@ -2,9 +2,9 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {RouterModule} from '@angular/router';
 import {AppComponent} from './app.component';
 import {EuiAppModule} from '@eui/components/layout';
-import {HttpClientTestingModule} from '@angular/common/http/testing';
-import {CoreModule} from "./core/core.module";
-import {routes} from "./app-routing.module";
+import {CoreModule} from './core/core.module';
+import {routes} from './app-routing.module';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 
 describe('AppComponent', () => {
     let component: AppComponent;
@@ -16,7 +16,9 @@ describe('AppComponent', () => {
                 RouterModule.forRoot(routes),
                 CoreModule,
                 EuiAppModule,
-                HttpClientTestingModule,
+            ],
+            providers: [
+                provideHttpClientTesting()
             ],
             declarations: [AppComponent],
         }).compileComponents();

package/lib/skeletons/_angular/base/src/app/app.module.ts

@@ -21,7 +21,7 @@ import { AppStarterService } from './app-starter.service';
         AppStarterService,
         {
             provide: APP_INITIALIZER,
-            useFactory: (appStarterService) => () => new Promise<void>((resolve) => {
+            useFactory: (appStarterService: AppStarterService) => () => new Promise<void>((resolve) => {
                     appStarterService.start().subscribe(() => resolve());
                 }),
             deps: [AppStarterService],

package/lib/skeletons/_angular/base/src/app/core/core.module.ts

@@ -3,7 +3,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { StoreModule } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
-import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
+import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import {
     CachePreventionInterceptor,
     CorsSecurityInterceptor,
@@ -17,10 +17,10 @@ import {
 import { EuiLayoutModule } from '@eui/components/layout';
 import { EuiUserProfileModule } from '@eui/components/eui-user-profile';
 
-import { appConfig } from '../../config/index';
+import { appConfig } from '../../config';
 import { environment } from '../../environments/environment';
 
-import { REDUCER_TOKEN, getReducers, metaReducers } from './reducers/index';
+import { REDUCER_TOKEN, getReducers, metaReducers } from './reducers';
 
 import { SharedModule } from '@shared/shared.module';
 
@@ -29,7 +29,6 @@ import { SharedModule } from '@shared/shared.module';
         EuiLayoutModule,
         EuiUserProfileModule,
         SharedModule,
-        HttpClientModule,
         EuiCoreModule.forRoot(),
         EffectsModule.forRoot([...CoreModuleEffects]),
         TranslateModule.forRoot(translateConfig),
@@ -45,6 +44,7 @@ import { SharedModule } from '@shared/shared.module';
         SharedModule,
     ],
     providers: [
+        provideHttpClient(withInterceptorsFromDi()),
         {
             provide: REDUCER_TOKEN,
             deps: [],

package/lib/skeletons/_angular/base/src/environments/environment.ts

@@ -1,6 +1,10 @@
 import { EuiEnvConfig } from '@eui/core';
 
-export const environment: EuiEnvConfig = {
+interface EnvConfig extends EuiEnvConfig {
+    production: boolean;
+}
+
+export const environment: EnvConfig = {
     production: false,
     enableDevToolRedux: true,
     envDynamicConfig: {

package/lib/skeletons/_angular/base-mobile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "18.0.1",
+    "version": "18.0.2-snapshot-1718177856730",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -21,7 +21,7 @@
     "private": true,
     "dependencies": {
         "@eui/deps-base": "16.2.18",
-        "@eui/mobile-core": "16.10.0",
-        "@eui/mobile-styles": "16.10.0"
+        "@eui/mobile-core": "16.10.1-snapshot-1714734024630",
+        "@eui/mobile-styles": "16.10.1-snapshot-1714734024630"
     }
 }

package/lib/skeletons/_angular/options/ecl-ec/src/app/app.component.ts

@@ -3,6 +3,7 @@ import { Store } from '@ngrx/store';
 import {
     getUserState,
     UserState,
+    CoreState,
 } from '@eui/core';
 import { Observable, Subscription } from 'rxjs';
 
@@ -26,7 +27,7 @@ export class AppComponent implements OnDestroy {
     isLoggedIn = false;
 
     constructor(
-        private store: Store<UserState>,
+        private store: Store<CoreState>,
     ) {
         this.userState = this.store.select(getUserState);
         this.subs.push(this.userState.subscribe((user: UserState) => {

package/lib/skeletons/web-symfony/myapp-web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "18.0.1",
+    "version": "18.0.2-snapshot-1718177856730",
     "license": "EUPL-1.1",
     "description": "eUI JEE Symfony app scripts",
     "scripts": {
@@ -18,6 +18,6 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "18.0.1"
+        "@eui/deps-base": "18.0.2-snapshot-1718177856730"
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@eui/cli",
-    "version": "18.0.1",
-    "tag": "latest",
+    "version": "18.0.2-snapshot-1718177856730",
+    "tag": "snapshot",
     "license": "EUPL-1.1",
     "description": "eUI CLI app generator",
     "bin": {