@eui/tools 6.16.9 → 6.16.11

package/.version.properties

@@ -1 +1 @@
-6.16.9
+6.16.11

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.16.11 (2024-04-12)
+
+##### Chores
+
+* **other:**
+  * re-activated ngrx setup config for v18 showcase - EUI-9014 [EUI-9014](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9014)  ([3edc5a72](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/3edc5a722c4a17a255466f0f06202848c9a51595))
+
+* * *
+* * *
+## 6.16.10 (2024-04-08)
+
+##### Bug Fixes
+
+* **other:**
+  * activate new styles dist structure only for v18 - EUI-9014 [EUI-9014](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9014)  ([643a0906](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/643a0906a0357c792f3686a114ea6640704a2c42))
+
+* * *
+* * *
 ## 6.16.9 (2024-04-07)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.16.9",
+    "version": "6.16.11",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/scripts/csdr/cli/skeletons/virtual-remote/17.x/dependencies.json

@@ -4,6 +4,7 @@
     "composite": {
         "@eui/deps-base": "^17.0.0",
         "@module.scope@/@module.name@": "^1.0.0",
+        "@cc/shared": "^6.0.0",
         "@mywp/shared": "^6.0.0",
         "@csdr/core": "^6.0.0",
         "@csdr/integration": "^5.0.0"

package/scripts/csdr/release/package/common.js

@@ -213,6 +213,17 @@ module.exports.preReleaseChecks = (pkg) => {
     }
   })
 
+  // CHECK eUI VERSION OF PKG VALIDITY (no v10 allowed after 5/04)
+  // .then(() => {
+  //   utils.tools.logTitle('Checking supported eUI version');
+
+  //   const euiVersion = configUtils.packages.getPackageEuiVersion(pkg);
+
+  //   if (euiVersion && euiVersion === '10.x') {
+  //     throw new Error('VERSION_10_NOT_SUPPORTED');
+  //   }
+  // })
+
   // CHECKING PACKAGE LOCK STATE - AVOID SAME PACKAGE RUN issuing race conditions
   .then(() => {
     if (!pkg.backend) {

package/scripts/utils/build/package/styles.js

@@ -245,10 +245,19 @@ module.exports.build = (pkg) => {
         }, Promise.resolve());
       }))
       .then(() => {
-        return tools.copydir(tmpFolderStyles, distFolder, true, `**/*.css`);
+        if (pkg.build.euiVersion !== '18.x') {
+          return tools.copydir(tmpFolder, distFolder, true, `**/*.css`);
+        } else {
+          return tools.copydir(tmpFolderStyles, distFolder, true, `**/*.css`);
+        }
       })
       .then(() => {
-        return tools.copydir(tmpFolderStyles, distFolder, true, `**/*.map`);
+        if (pkg.build.euiVersion !== '18.x') {
+          return tools.copydir(tmpFolder, distFolder, true, `**/*.map`);
+        } else {
+          return tools.copydir(tmpFolderStyles, distFolder, true, `**/*.map`);
+        }
+
       })
       .then(() => {
         console.log('Output CSS copy succeeded');

package/scripts/utils/pre-build/injection/app-sources-full-skeleton-eui18/src/_generated/app/app.module.ts

@@ -4,8 +4,8 @@ import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { HttpClientModule } from '@angular/common/http';
 import { StoreModule } from '@ngrx/store';
-// import { EffectsModule } from '@ngrx/effects';
-// import { StoreDevtoolsModule } from '@ngrx/store-devtools';
+import { EffectsModule } from '@ngrx/effects';
+import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 import { TranslateModule } from '@ngx-translate/core';
 
 // eUI IMPORTS
@@ -21,7 +21,7 @@ import { environment } from '../environments/environment';
 import { AppRoutingModule } from '../../app/app-routing.module';
 import { AppComponent } from '../../app/app.component';
 
-// import { TOKEN, reducerProvider, metaReducers, runtimeChecks } from './core/reducers/index';
+import { TOKEN, reducerProvider, metaReducers, runtimeChecks } from './core/reducers/index';
 
 // APP ROOT MODULE
 @NgModule({
@@ -29,8 +29,8 @@ import { AppComponent } from '../../app/app.component';
         BrowserModule,
         BrowserAnimationsModule,
         HttpClientModule,
-        // StoreModule.forRoot(TOKEN, { metaReducers, runtimeChecks }),
-        StoreModule.forRoot(),
+        StoreModule.forRoot(TOKEN, { metaReducers, runtimeChecks }),
+        // StoreModule.forRoot(),
         TranslateModule.forRoot(translateConfig),
         CoreModule.forRoot(),
         AppRoutingModule,
@@ -41,7 +41,7 @@ import { AppComponent } from '../../app/app.component';
     ],
     providers: [
         { provide: EUI_CONFIG_TOKEN, useValue: { appConfig: appConfig, environment: environment } },
-        // reducerProvider,
+        reducerProvider,
     ],
     bootstrap: [
         AppComponent,

package/scripts/utils/pre-build/injection/app-sources-full-skeleton-eui18/src/_generated/app/core/reducers/index.ts

@@ -1,49 +1,50 @@
-// import { InjectionToken } from '@angular/core';
-// import { ActionReducer, ActionReducerMap, MetaReducer, RuntimeChecks } from '@ngrx/store';
-// import * as fromRouter from '@ngrx/router-store';
-// import { storeFreeze } from 'ngrx-store-freeze';
-// import { reducers as coreReducers, CoreState, localStorageSync } from '@eui/core';
-
-// export interface AppState extends CoreState {
-//     router: fromRouter.RouterReducerState<any>;
-// }
-
-// // -----------------
-// // ------------ AOT
-// export const TOKEN = new InjectionToken<any>('AppReducers');
-
-// export function getReducers(): ActionReducerMap<AppState, any> {
-//     return {
-//         router: fromRouter.routerReducer,
-//         ...coreReducers,
-//     };
-// }
-
-// export const reducerProvider = [
-//     { provide: TOKEN, useFactory: getReducers },
-// ];
-
-// // console.log all actions
-// export function logger(reducer: ActionReducer<AppState>): ActionReducer<AppState> {
-//     return (state, action) => {
-//         const result = reducer(state, action);
-//         console.groupCollapsed(action.type);
-//         console.log('prev state', state);
-//         console.log('action', action);
-//         console.log('next state', result);
-//         console.groupEnd();
-
-//         return result;
-//     };
-// }
-
-// export const metaReducers: MetaReducer<AppState>[] = [logger, localStorageSync, storeFreeze];
-
-// export const runtimeChecks: RuntimeChecks = {
-//     strictStateSerializability: false,
-//     strictActionSerializability: false,
-//     strictStateImmutability: false,
-//     strictActionImmutability: false,
-//     strictActionWithinNgZone: false,
-//     strictActionTypeUniqueness: false,
-// };
+import { InjectionToken } from '@angular/core';
+import { ActionReducer, ActionReducerMap, MetaReducer, RuntimeChecks } from '@ngrx/store';
+import * as fromRouter from '@ngrx/router-store';
+import { storeFreeze } from 'ngrx-store-freeze';
+import { reducers as coreReducers, localStorageSync } from '@eui/core';
+import { CoreState } from '@eui/base';
+
+export interface AppState extends CoreState {
+    router: fromRouter.RouterReducerState<any>;
+}
+
+// -----------------
+// ------------ AOT
+export const TOKEN = new InjectionToken<any>('AppReducers');
+
+export function getReducers(): ActionReducerMap<AppState, any> {
+    return {
+        router: fromRouter.routerReducer,
+        ...coreReducers,
+    };
+}
+
+export const reducerProvider = [
+    { provide: TOKEN, useFactory: getReducers },
+];
+
+// console.log all actions
+export function logger(reducer: ActionReducer<AppState>): ActionReducer<AppState> {
+    return (state, action) => {
+        const result = reducer(state, action);
+        console.groupCollapsed(action.type);
+        console.log('prev state', state);
+        console.log('action', action);
+        console.log('next state', result);
+        console.groupEnd();
+
+        return result;
+    };
+}
+
+export const metaReducers: MetaReducer<AppState>[] = [logger, localStorageSync, storeFreeze];
+
+export const runtimeChecks: RuntimeChecks = {
+    strictStateSerializability: false,
+    strictActionSerializability: false,
+    strictStateImmutability: false,
+    strictActionImmutability: false,
+    strictActionWithinNgZone: false,
+    strictActionTypeUniqueness: false,
+};