@eui/tools 6.16.4 → 6.16.6

package/scripts/csdr/install/remotes.js

@@ -77,6 +77,21 @@ const pkgInstall = (pkg, envTarget) => {
       // merging base+composite
       deps = { ...baseDeps, ...compositeDeps };
 
+
+      // parse eUI deps and explode the sub-packages (v17 issues)
+      // getting package eUI version
+      const euiVersion = configUtils.packages.getPackageEuiVersion(pkg);
+
+      // add sub-eUI packages for v17
+      if (euiVersion === '17.x') {
+        Object.keys(deps).forEach((dep) => {
+          if (dep === '@eui/deps-base') {
+            deps['@eui/components'] = deps[dep];
+            deps['@eui/showcase'] = deps[dep];
+          }
+        });
+      }
+
       // updating package json file before installation
       const pkgJsonFile = path.resolve(pkg.paths.root, 'package.json');
       const pkgJson = require(pkgJsonFile);
@@ -86,9 +101,6 @@ const pkgInstall = (pkg, envTarget) => {
       // store dependencies metadata for later fetch of remote deps installed for a particular version published
       pkgJson.remoteDependencies = deps;
 
-      // getting package eUI version
-      const euiVersion = configUtils.packages.getPackageEuiVersion(pkg);
-
       // checking for resolution updates according to eUI version used
       initUtils.global.initRemoteFilesAndResolutions(pkg.paths.root, euiVersion);
 

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

@@ -4,13 +4,13 @@ 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
 import {
-    CoreModule, CoreModuleEffects, translateConfig, EUI_CONFIG_TOKEN,
+    CoreModule, translateConfig, EUI_CONFIG_TOKEN,
 } from '@eui/core';
 import { EuiAllModule } from '@eui/components';
 
@@ -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,9 +29,8 @@ import { TOKEN, reducerProvider, metaReducers, runtimeChecks } from './core/redu
         BrowserModule,
         BrowserAnimationsModule,
         HttpClientModule,
-        StoreModule.forRoot(TOKEN, { metaReducers, runtimeChecks }),
-        StoreDevtoolsModule.instrument({ name: 'CSDR App', maxAge: 150, logOnly: environment.production }),
-        EffectsModule.forRoot([...CoreModuleEffects]),
+        // StoreModule.forRoot(TOKEN, { metaReducers, runtimeChecks }),
+        StoreModule.forRoot(),
         TranslateModule.forRoot(translateConfig),
         CoreModule.forRoot(),
         AppRoutingModule,
@@ -42,7 +41,7 @@ import { TOKEN, reducerProvider, metaReducers, runtimeChecks } from './core/redu
     ],
     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,49 @@
-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, 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,
+// };

package/scripts/utils/pre-build/injection/skeletons.js

@@ -52,6 +52,9 @@ module.exports.injectCsdrFullSkeletonSources = (project, euiVersion) => {
   tools.logInfo(`Injecting CSDR full skeleton sources for : ${project.name} - eUI version : ${euiVersion}`);
 
   return Promise.resolve()
+    .then(() => {
+      tools.rimraf(path.join(project.folder, 'src', '_generated'));
+    })
     .then(() => {
       // copying skeleton sources
       if (euiVersion === '13.x') {