@eui/cli 19.0.0-next.4 → 19.0.0-next.6

package/.version.properties

@@ -1 +1 @@
-19.0.0-next.4
+19.0.0-next.6

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

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "19.0.0-next.4",
+    "version": "19.0.0-next.6",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -21,7 +21,7 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "19.0.0-next.4"
+        "@eui/deps-base": "19.0.0-next.6"
     },
     "resolutions": {
         "js-yaml": ">=3.13.1",

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

@@ -3,7 +3,7 @@ import {RouterModule} from '@angular/router';
 import {AppComponent} from './app.component';
 import {EuiAppModule} from '@eui/components/layout';
 import {CoreModule} from './core/core.module';
-import {routes} from './app-routing.module';
+import {routes} from './app.routes';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
 
 describe('AppComponent', () => {

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

@@ -1,8 +1,23 @@
 import { Component } from '@angular/core';
+// import { BrowserModule } from '@angular/platform-browser';
+// import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { TranslateModule } from '@ngx-translate/core';
+import { EuiLayoutModule } from '@eui/components/layout';
+import { EuiLanguageSelectorModule } from '@eui/components/eui-language-selector';
+import { EuiUserProfileModule } from '@eui/components/eui-user-profile';
+import { EuiIconModule } from '@eui/components/eui-icon';
 
 @Component({
     selector: 'app-root',
     templateUrl: './app.component.html',
+    standalone: true,
+    imports: [
+        TranslateModule,
+        EuiLayoutModule,
+        EuiIconModule,
+        EuiUserProfileModule,
+        EuiLanguageSelectorModule,
+    ],
 })
 export class AppComponent {
     sidebarItems = [

package/lib/skeletons/_angular/base/src/app/{core/core.module.ts → app.config.ts}

@@ -1,8 +1,11 @@
-import { NgModule } from '@angular/core';
+import { APP_INITIALIZER, ApplicationConfig, importProvidersFrom } from '@angular/core';
+import { provideRouter } from '@angular/router';
+
+import { routes } from './app.routes';
+import { AppStarterService } from './app-starter.service';
+
 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, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import {
     CachePreventionInterceptor,
@@ -11,48 +14,20 @@ import {
     EuLoginSessionTimeoutHandlingInterceptor,
     CoreModule as EuiCoreModule,
     translateConfig,
-    CoreModuleEffects,
     EUI_CONFIG_TOKEN,
 } from '@eui/core';
-import { EuiLayoutModule } from '@eui/components/layout';
-import { EuiUserProfileModule } from '@eui/components/eui-user-profile';
 
-import { appConfig } from '../../config';
-import { environment } from '../../environments/environment';
+import { appConfig as euiAppConfig} from '../config';
+import { environment } from '../environments/environment';
 
-import { REDUCER_TOKEN, getReducers, metaReducers } from './reducers';
-
-import { SharedModule } from '@shared/shared.module';
-
-@NgModule({
-    imports: [
-        EuiLayoutModule,
-        EuiUserProfileModule,
-        SharedModule,
-        EuiCoreModule.forRoot(),
-        EffectsModule.forRoot([...CoreModuleEffects]),
-        TranslateModule.forRoot(translateConfig),
-        StoreModule.forRoot(REDUCER_TOKEN, { metaReducers }),
-        StoreModule.forRoot(REDUCER_TOKEN, { metaReducers }),
-        !environment.production ? StoreDevtoolsModule.instrument({ maxAge: 50 }) : [],
-    ],
-    declarations: [
-    ],
-    exports: [
-        EuiLayoutModule,
-        EuiUserProfileModule,
-        SharedModule,
-    ],
+export const appConfig: ApplicationConfig = {
     providers: [
+        importProvidersFrom(EuiCoreModule.forRoot()),
+        importProvidersFrom(TranslateModule.forRoot(translateConfig)),
         provideHttpClient(withInterceptorsFromDi()),
-        {
-            provide: REDUCER_TOKEN,
-            deps: [],
-            useFactory: getReducers,
-        },
         {
             provide: EUI_CONFIG_TOKEN,
-            useValue: { appConfig, environment }
+            useValue: { euiAppConfig, environment }
         },
         {
             // Sets the withCredentials on Ajax Request to send the JSESSIONID cookie to another domain.
@@ -83,8 +58,16 @@ import { SharedModule } from '@shared/shared.module';
             useClass: CachePreventionInterceptor,
             multi: true,
         },
-    ]
-})
-export class CoreModule {
 
-}
+        AppStarterService,
+        // {
+        //     provide: APP_INITIALIZER,
+        //     useFactory: (appStarterService: AppStarterService) => () => new Promise<void>((resolve) => {
+        //         appStarterService.start().subscribe(() => resolve());
+        //     }),
+        //     deps: [AppStarterService],
+        //     multi: true
+        // },
+        provideRouter(routes),
+    ],
+};

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

@@ -0,0 +1,9 @@
+import { Routes } from '@angular/router';
+
+export const routes: Routes = [
+    { path: '', redirectTo: 'screen/home', pathMatch: 'full' },
+    { path: 'index.jsp', redirectTo: 'screen/home' },
+    { path: 'screen/home', loadChildren: () => import('./features/home/home.routes').then(m => m.HOME_ROUTES) },
+    { path: 'screen/module1', loadChildren: () => import('./features/module1/module1.routes').then(m => m.MODULE1_ROUTES) },
+    { path: 'screen/module2', loadChildren: () => import('./features/module2/module2.routes').then(m => m.MODULE2_ROUTES) },
+];

package/lib/skeletons/_angular/base/src/app/features/home/home.component.ts

@@ -1,12 +1,18 @@
 import { Component, Inject } from '@angular/core';
-import { CONFIG_TOKEN } from '@eui/core';
-import { EuiAppConfig } from '@eui/core';
+import { CONFIG_TOKEN, EuiAppConfig } from '@eui/core';
+import { EuiPageModule } from '@eui/components/eui-page';
+import { TranslateModule } from '@ngx-translate/core';
 
 @Component({
     templateUrl: './home.component.html',
+    standalone: true,
+    imports: [
+        EuiPageModule,
+        TranslateModule,
+    ],
 })
 export class HomeComponent {
-    constructor(@Inject(CONFIG_TOKEN) private config: EuiAppConfig) {
+    constructor(@Inject(CONFIG_TOKEN) protected config: EuiAppConfig) {
         console.log(config);
     }
 }

package/lib/skeletons/_angular/base/src/app/features/home/home.routes.ts

@@ -0,0 +1,6 @@
+import { Routes } from '@angular/router';
+import { HomeComponent } from './home.component';
+
+export const HOME_ROUTES: Routes = [
+    { path: '', component: HomeComponent },
+];

package/lib/skeletons/_angular/base/src/app/features/module1/components/page1/page1.component.ts

@@ -1,7 +1,11 @@
 import { Component } from '@angular/core';
+import { EuiPageModule } from '@eui/components/eui-page';
 
 @Component({
-    templateUrl: './page1.component.html'
+    templateUrl: './page1.component.html',
+    standalone: true,
+    imports: [
+        EuiPageModule,
+    ],
 })
-export class Page1Component {
-}
+export class Page1Component {}

package/lib/skeletons/_angular/base/src/app/features/module1/components/page2/page2.component.ts

@@ -1,7 +1,11 @@
 import { Component } from '@angular/core';
+import { EuiPageModule } from '@eui/components/eui-page';
 
 @Component({
-    templateUrl: './page2.component.html'
+    templateUrl: './page2.component.html',
+    standalone: true,
+    imports: [
+        EuiPageModule,
+    ],
 })
-export class Page2Component {
-}
+export class Page2Component {}

package/lib/skeletons/_angular/base/src/app/features/module1/module1.component.ts

@@ -1,8 +1,11 @@
 import { Component } from '@angular/core';
+import { EuiPageModule } from '@eui/components/eui-page';
 
 @Component({
     templateUrl: './module1.component.html',
+    standalone: true,
+    imports: [
+        EuiPageModule,
+    ],
 })
-export class Module1Component {
-
-}
+export class Module1Component {}

package/lib/skeletons/_angular/base/src/app/features/module1/{module1-routing.module.ts → module1.routes.ts}

@@ -1,18 +1,10 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+import { Routes } from '@angular/router';
 import { Page1Component } from './components/page1/page1.component';
 import { Page2Component } from './components/page2/page2.component';
 import { Module1Component } from './module1.component';
 
-const routes: Routes = [
+export const MODULE1_ROUTES: Routes = [
     { path: '', component: Module1Component },
     { path: 'page1', component: Page1Component },
     { path: 'page2', component: Page2Component },
 ];
-
-@NgModule({
-    imports: [
-        RouterModule.forChild(routes)
-    ],
-})
-export class Module1RoutingModule {}

package/lib/skeletons/_angular/base/src/app/features/module2/module2.component.ts

@@ -1,7 +1,11 @@
 import { Component } from '@angular/core';
+import { EuiPageModule } from '@eui/components/eui-page';
 
 @Component({
-    templateUrl: './module2.component.html'
+    templateUrl: './module2.component.html',
+    standalone: true,
+    imports: [
+        EuiPageModule,
+    ],
 })
-export class Module2Component {
-}
+export class Module2Component {}

package/lib/skeletons/_angular/base/src/app/features/module2/module2.routes.ts

@@ -0,0 +1,6 @@
+import { Routes } from '@angular/router';
+import { Module2Component } from './module2.component';
+
+export const MODULE2_ROUTES: Routes = [
+    { path: '', component: Module2Component },
+];

package/lib/skeletons/_angular/base/src/main.ts

@@ -1,19 +1,16 @@
-import { enableProdMode } from "@angular/core";
-import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
-import { preInitApp } from "@eui/core";
-
-import { AppModule } from "./app/app.module";
-import { environment } from "./environments/environment";
+import { enableProdMode } from '@angular/core';
+import { preInitApp } from '@eui/core';
+import { environment } from './environments/environment';
+import { bootstrapApplication } from '@angular/platform-browser';
+import { AppComponent } from './app/app.component';
+import { appConfig } from './app/app.config';
 
 if (environment.production) {
     enableProdMode();
 }
 
 preInitApp(environment).then(() =>
-    platformBrowserDynamic()
-        .bootstrapModule(AppModule)
-        .catch((err) => console.error(err))
-);
+    bootstrapApplication(AppComponent, appConfig).catch((err) => console.error(err)));
 
 declare global {
     interface Window {

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

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "19.0.0-next.4",
+    "version": "19.0.0-next.6",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",

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

@@ -6,16 +6,21 @@ import {
     CoreState,
 } from '@eui/core';
 import { Observable, Subscription } from 'rxjs';
-
-import {
-    EclMenuItemSelectEvent,
-    EclSiteHeaderLoginEvent,
-    EclSiteHeaderSearchEvent,
-} from '@eui/ecl';
+import { EclSiteHeaderLoginEvent, EclSiteHeaderSearchEvent } from '@eui/ecl/components/ecl-site-header';
+import { EclMenuItemSelectEvent } from '@eui/ecl/components/ecl-menu';
+import { EclAllModule } from '@eui/ecl';
+import { RouterOutlet } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
 
 @Component({
     selector: 'app-root',
     templateUrl: './app.component.html',
+    standalone: true,
+    imports: [
+        EclAllModule, // TODO import the relevant component modules instead of the "All" one
+        RouterOutlet,
+        TranslateModule,
+    ]
 })
 export class AppComponent implements OnDestroy {
     userInfos: UserState;

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

@@ -6,16 +6,13 @@ import {
     CoreState,
 } from '@eui/core';
 import { Observable, Subscription } from 'rxjs';
-
-import {
-    EclMenuItemSelectEvent,
-    EclSiteHeaderLoginEvent,
-    EclSiteHeaderSearchEvent,
-} from '@eui/ecl';
+import { EclSiteHeaderLoginEvent, EclSiteHeaderSearchEvent } from '@eui/ecl/components/ecl-site-header';
+import { EclMenuItemSelectEvent } from '@eui/ecl/components/ecl-menu';
 
 @Component({
     selector: 'app-root',
     templateUrl: './app.component.html',
+    standalone: true,
 })
 export class AppComponent implements OnDestroy {
     userInfos: UserState;

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

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "19.0.0-next.4",
+    "version": "19.0.0-next.6",
     "license": "EUPL-1.1",
     "description": "eUI JEE Symfony app scripts",
     "scripts": {
@@ -18,6 +18,6 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "19.0.0-next.4"
+        "@eui/deps-base": "19.0.0-next.6"
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/cli",
-    "version": "19.0.0-next.4",
+    "version": "19.0.0-next.6",
     "tag": "next",
     "license": "EUPL-1.1",
     "description": "eUI CLI app generator",

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

@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-
-export const routes: Routes = [
-    { path: '', redirectTo: 'screen/home', pathMatch: 'full' },
-    { path: 'index.jsp', redirectTo: 'screen/home' },
-    { path: 'screen/home', loadChildren: () => import('./features/home/home.module').then(m => m.Module) },
-    { path: 'screen/module1', loadChildren: () => import('./features/module1/module1.module').then(m => m.Module) },
-    { path: 'screen/module2', loadChildren: () => import('./features/module2/module2.module').then(m => m.Module) },
-];
-
-@NgModule({
-    imports: [
-        RouterModule.forRoot(routes),
-    ],
-})
-export class AppRoutingModule {}

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

@@ -1,31 +0,0 @@
-import {TestBed} from '@angular/core/testing';
-import {AppModule} from './app.module';
-import {AppStarterService} from './app-starter.service';
-import {of} from 'rxjs';
-
-describe('AppModule', () => {
-    let appStarterService: AppStarterService;
-
-    beforeAll(() => {
-        TestBed.resetTestingModule()
-    });
-
-    beforeEach(async () => {
-        const appStarterServiceMock = {
-            start: jasmine.createSpy('start').and.returnValue(of(null)),
-        };
-        await TestBed.configureTestingModule({
-            imports: [AppModule],
-            providers: [
-                {provide: AppStarterService, useValue: appStarterServiceMock},
-            ],
-        }).compileComponents();
-
-        appStarterService = TestBed.inject(AppStarterService);
-    });
-
-    it('should call start method of AppStarterService', () => {
-        expect(appStarterService.start).toHaveBeenCalled();
-    });
-
-});

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

@@ -1,35 +0,0 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { APP_INITIALIZER, NgModule } from '@angular/core';
-
-import { AppRoutingModule } from './app-routing.module';
-import { AppComponent } from './app.component';
-import { CoreModule } from './core/core.module';
-import { AppStarterService } from './app-starter.service';
-
-@NgModule({
-    declarations: [
-        AppComponent,
-    ],
-    imports: [
-        BrowserModule,
-        BrowserAnimationsModule,
-        CoreModule,
-        AppRoutingModule,
-    ],
-    providers: [
-        AppStarterService,
-        {
-            provide: APP_INITIALIZER,
-            useFactory: (appStarterService: AppStarterService) => () => new Promise<void>((resolve) => {
-                    appStarterService.start().subscribe(() => resolve());
-                }),
-            deps: [AppStarterService],
-            multi: true
-        },
-    ],
-    bootstrap: [
-        AppComponent,
-    ],
-})
-export class AppModule {}

package/lib/skeletons/_angular/base/src/app/core/reducers/index.ts

@@ -1,33 +0,0 @@
-import { InjectionToken } from '@angular/core';
-import { MetaReducer } from '@ngrx/store';
-import { storeFreeze } from 'ngrx-store-freeze';
-import { reducers as coreReducers, localStorageSync } from '@eui/core';
-import { CoreState, getAppState } from '@eui/core';
-
-import { environment } from '../../../environments/environment';
-
-// eslint-disable-next-line
-export const REDUCER_TOKEN = new InjectionToken<any>('Registered Reducers');
-
-/**
- * Define here your app state
- *
- * [IMPORTANT]
- * There are some **reserved** slice of the state
- * that you **can not** use in your application ==> app |user | notification
- */
-// eslint-disable-next-line
-export interface AppState extends CoreState {
-    // [key: string]: fromTaskManager.State | any;
-}
-
-/**
- * Define here the reducers of your app
- */
-const rootReducer = Object.assign({}, coreReducers, {
-    // [fromTaskManager.namespace]: fromTaskManager.reducers,
-});
-
-export const getReducers = () => rootReducer;
-
-export const metaReducers: MetaReducer<AppState>[] = !environment.production ? [localStorageSync, storeFreeze] : [localStorageSync];

package/lib/skeletons/_angular/base/src/app/features/home/home-routing.module.ts

@@ -1,15 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-
-import { HomeComponent } from './home.component';
-
-const routes: Routes = [
-    { path: '', component: HomeComponent },
-];
-
-@NgModule({
-    imports: [
-        RouterModule.forChild(routes)
-    ],
-})
-export class HomeRoutingModule {}

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

@@ -1,18 +0,0 @@
-import { NgModule } from '@angular/core';
-
-import { SharedModule } from '@shared/shared.module';
-
-import { HomeRoutingModule } from './home-routing.module';
-
-import { HomeComponent } from './home.component';
-
-@NgModule({
-    imports: [
-        SharedModule,
-        HomeRoutingModule,
-    ],
-    declarations: [
-        HomeComponent,
-    ],
-})
-export class Module {}

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

@@ -1,21 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Module1RoutingModule } from './module1-routing.module';
-import { Module1Component } from './module1.component';
-import { Page1Component } from './components/page1/page1.component';
-import { Page2Component } from './components/page2/page2.component';
-
-import { SharedModule } from '@shared/shared.module';
-
-@NgModule({
-    imports: [
-        SharedModule,
-        Module1RoutingModule,
-    ],
-    declarations: [
-        Module1Component,
-        Page1Component,
-        Page2Component,
-    ],
-})
-export class Module {
-}

package/lib/skeletons/_angular/base/src/app/features/module2/module2-routing.module.ts

@@ -1,16 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-import { Module2Component } from './module2.component';
-
-const routes: Routes = [
-    { path: '', component: Module2Component },
-];
-
-@NgModule({
-    imports: [
-        RouterModule.forChild([
-            { path: '', component: Module2Component }
-        ])
-    ],
-})
-export class Module2RoutingModule {}

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

@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Module2RoutingModule } from './module2-routing.module';
-import { Module2Component } from './module2.component';
-
-import { SharedModule } from '@shared/shared.module';
-
-@NgModule({
-    imports: [
-        SharedModule,
-        Module2RoutingModule,
-    ],
-    declarations: [
-        Module2Component,
-    ],
-})
-export class Module {
-}

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

@@ -1,45 +0,0 @@
-// Angular
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-
-// Common 3rd party module used accross the app
-import { TranslateModule } from '@ngx-translate/core';
-
-// eUI specific modules - commonly used accross the app - prefered way
-// keep here to avoid imports within features modules
-import { EuiPageModule } from '@eui/components/eui-page';
-import { EuiIconModule } from '@eui/components/eui-icon';
-import { EuiUserProfileModule } from '@eui/components/eui-user-profile';
-import { EuiLanguageSelectorModule } from '@eui/components/eui-language-selector';
-
-// import ALL eUI components
-// import { EuiAllModule } from '@eui/components';
-
-const MODULES = [
-    CommonModule,
-    FormsModule, ReactiveFormsModule,
-
-    TranslateModule,
-
-    // put here commonly used eUI modules components throughout the application
-    EuiPageModule,
-    EuiIconModule,
-    EuiUserProfileModule,
-    EuiLanguageSelectorModule,
-
-    // in case of you really want to import all eUI components, see commented imports above
-    // EuiAllModule,
-];
-
-@NgModule({
-    imports: [
-        ...MODULES,
-    ],
-    declarations: [
-    ],
-    exports: [
-        ...MODULES,
-    ]
-})
-export class SharedModule {}

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

@@ -1,19 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-import { CommonModule } from '@angular/common';
-import { TranslateModule } from '@ngx-translate/core';
-
-import { EclAllModule } from '@eui/ecl';
-
-const MODULES = [
-    RouterModule,
-    EclAllModule,
-    TranslateModule,
-    CommonModule,
-];
-@NgModule({
-    imports: [...MODULES],
-    declarations: [],
-    exports: [...MODULES],
-})
-export class SharedModule {}