@eui/tools 6.12.62 → 6.12.64

package/.version.properties

@@ -1 +1 @@
-6.12.62
+6.12.64

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.12.64 (2023-10-07)
+
+##### Chores
+
+* **other:**
+  * adapted skeleton sources and config to v17 - EUI-7843 [EUI-7843](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7843)  ([3baac547](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/3baac547f5f1458f321956a0d9ea82ea4d0faa7b))
+
+* * *
+* * *
+## 6.12.63 (2023-10-05)
+
+##### Bug Fixes
+
+* **other:**
+  * vulnerable deps - EUI-8107 [EUI-8107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-8107)  ([7234a427](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/7234a427e02196e14e258bb10c795771f7c2e619))
+
+* * *
+* * *
 ## 6.12.62 (2023-09-29)
 
 ##### Chores

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.12.62",
+    "version": "6.12.64",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",
@@ -39,7 +39,7 @@
         "cssnano": "5.1.14",
         "extend": "3.0.2",
         "mocha": "10.2.0",
-        "chai": "4.3.7",
+        "chai": "4.3.10",
         "nyc": "15.1.0",
         "node-fetch": "2.6.9",
         "svg-sprite": "2.0.2",

package/scripts/csdr/config/angular.js

@@ -16,10 +16,12 @@ const {
   angularProjectDef,
   angularProjectDefV13,
   angularProjectDefV14,
+  angularProjectDefV17,
   angularProjectLightDef,
   angularProjectDefFullSkeleton,
   angularProjectDefFullSkeletonV13,
   angularProjectDefFullSkeletonV14,
+  angularProjectDefFullSkeletonV17,
   angularProjectDefConfiguration,
   angularProjectDefConfigurationHost,
   angularProjectDefConfigurationLight,
@@ -225,9 +227,12 @@ module.exports.registerAngularProjectDef = (project, build = false, element = fa
         if (euiVersion === '13.x') {
           projectDef = JSON.stringify(angularProjectDefFullSkeletonV13);
           tools.logInfo(`----using angularProjectDefFullSkeletonV13`);
-        } else if (euiVersion === '14.x' || euiVersion === '15.x' || euiVersion === '16.x' || euiVersion === '17.x') {
+        } else if (euiVersion === '14.x' || euiVersion === '15.x' || euiVersion === '16.x') {
           projectDef = JSON.stringify(angularProjectDefFullSkeletonV14);
           tools.logInfo(`----using angularProjectDefFullSkeletonV14`);
+        } else if (euiVersion === '17.x') {
+          projectDef = JSON.stringify(angularProjectDefFullSkeletonV17);
+          tools.logInfo(`----using angularProjectDefFullSkeletonV17`);
         } else {
           projectDef = JSON.stringify(angularProjectDefFullSkeleton);
           tools.logInfo(`----using angularProjectDefFullSkeleton`);
@@ -237,9 +242,12 @@ module.exports.registerAngularProjectDef = (project, build = false, element = fa
         if (euiVersion === '13.x') {
           projectDef = JSON.stringify(angularProjectDefV13);
           tools.logInfo(`----using angularProjectDefV13`);
-        } else if (euiVersion === '14.x' || euiVersion === '15.x' || euiVersion === '16.x' || euiVersion === '17.x') {
+        } else if (euiVersion === '14.x' || euiVersion === '15.x' || euiVersion === '16.x') {
           projectDef = JSON.stringify(angularProjectDefV14);
           tools.logInfo(`----using angularProjectDefV14`);
+        } else if (euiVersion === '17.x') {
+          projectDef = JSON.stringify(angularProjectDefV17);
+          tools.logInfo(`----using angularProjectDefV17`);
         } else {
           if (project.build && project.build.csdrFileReplacement === true) {
             projectDef = JSON.stringify(angularProjectLightDef);

package/scripts/csdr/config/config-skeletons.js

@@ -542,6 +542,170 @@ module.exports.angularProjectDefV14 = {
 };
 
 
+module.exports.angularProjectDefV17 = {
+  "root": "",
+  "sourceRoot": "apps/@project.name@/src",
+  "projectType": "application",
+  "prefix": "app",
+  "schematics": {
+    "@schematics/angular:component": {
+      "style": "scss"
+    },
+    "@schematics/angular:application": {
+      "strict": true
+    }
+  },
+  "architect": {
+      "lint": {
+        "builder": "@angular-eslint/builder:lint",
+        "options": {
+          "lintFilePatterns": [
+            "apps/@project.name@/**/*.ts",
+            "apps/@project.name@/**/*.html"
+          ],
+          "eslintConfig": "apps/@project.name@/.eslintrc.json"
+        }
+      },
+      "build": {
+          "builder": "@angular-devkit/build-angular:application",
+          "options": {
+              "outputPath": "apps/@project.name@/dist",
+              "index": "apps/@project.name@/src/index.html",
+              "browser": "apps/@project.name@/src/main.ts",
+              "polyfills": [
+                "zone.js"
+              ],
+              "tsConfig": "apps/@project.name@/tsconfig.app.json",
+              "assets": [
+                  "apps/@project.name@/src/favicon.ico",
+                  "apps/@project.name@/src/assets",
+                  {
+                      "glob": "**/*",
+                      "input": "node_modules/@eui/core/assets/",
+                      "output": "./assets"
+                  }
+              ],
+              "styles": [
+              ]
+          },
+          "configurations": {
+              "production": {
+                  "fileReplacements": [
+                      {
+                          "replace": "apps/@project.name@/src/environments/environment.ts",
+                          "with": "apps/@project.name@/src/environments/environment.prod.ts"
+                      }
+                  ],
+                  "optimization": false,
+                  "outputHashing": "all",
+                  "sourceMap": false,
+                  "namedChunks": true,
+                  "aot": true,
+                  "extractLicenses": true,
+                  "vendorChunk": false,
+                  "buildOptimizer": false,
+                  "budgets": [
+                      {
+                          "type": "initial",
+                          "maximumWarning": "2mb",
+                          "maximumError": "8mb"
+                      }
+                  ]
+              },
+              "production-optimized": {
+                  "fileReplacements": [
+                      {
+                          "replace": "apps/@project.name@/src/environments/environment.ts",
+                          "with": "apps/@project.name@/src/environments/environment.prod.ts"
+                      }
+                  ],
+                  "optimization": {
+                    "scripts": true,
+                    "styles": {
+                        "minify": false,
+                        "inlineCritical": true
+                    },
+                    "fonts": true
+                  },
+                  "outputHashing": "all",
+                  "sourceMap": false,
+                  "namedChunks": true,
+                  "aot": true,
+                  "extractLicenses": true,
+                  "vendorChunk": false,
+                  "buildOptimizer": true,
+                  "budgets": [
+                      {
+                          "type": "initial",
+                          "maximumWarning": "2mb",
+                          "maximumError": "8mb"
+                      }
+                  ]
+              },
+              "production-optimized-no-openid": {
+                "fileReplacements": [
+                    {
+                        "replace": "apps/@project.name@/src/environments/environment.ts",
+                        "with": "apps/@project.name@/src/environments/environment.prod.ts"
+                    }
+                ],
+                "optimization": {
+                  "scripts": true,
+                  "styles": {
+                      "minify": false,
+                      "inlineCritical": true
+                  },
+                  "fonts": true
+                },
+                "outputHashing": "all",
+                "sourceMap": false,
+                "namedChunks": true,
+                "aot": true,
+                "extractLicenses": true,
+                "vendorChunk": false,
+                "buildOptimizer": true,
+                "budgets": [
+                    {
+                        "type": "initial",
+                        "maximumWarning": "2mb",
+                        "maximumError": "8mb"
+                    }
+                ]
+              },
+              "development": {
+                  "buildOptimizer": false,
+                  "optimization": false,
+                  "vendorChunk": true,
+                  "extractLicenses": false,
+                  "sourceMap": true,
+                  "namedChunks": true
+              }
+          },
+          "defaultConfiguration": "production"
+      },
+      "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+              "browserTarget": "@project.name@:build"
+          },
+          "configurations": {
+              "proxy-mock": {
+                  "browserTarget": "@project.name@:build:development",
+                  "proxyConfig": "apps/@project.name@/proxy-mock.conf.json"
+              },
+              "production": {
+                  "browserTarget": "@project.name@:build:production"
+              },
+              "development": {
+                "browserTarget": "@project.name@:build:development"
+              }
+          },
+          "defaultConfiguration": "development"
+      }
+  }
+};
+
+
 
 module.exports.angularProjectLightDef = {
   "root": "",
@@ -1001,6 +1165,115 @@ module.exports.angularProjectDefFullSkeletonV14 = {
 
 
 
+module.exports.angularProjectDefFullSkeletonV17 = {
+  "root": "",
+  "sourceRoot": "apps/@project.name@/src",
+  "projectType": "application",
+  "prefix": "app",
+  "schematics": {
+    "@schematics/angular:component": {
+      "style": "scss"
+    },
+    "@schematics/angular:application": {
+      "strict": true
+    }
+  },
+  "architect": {
+      "build": {
+          "builder": "@angular-devkit/build-angular:application",
+          "options": {
+              "outputPath": "apps/@project.name@/dist",
+              "index": "apps/@project.name@/src/index.html",
+              "browser": "apps/@project.name@/src/_generated/main.ts",
+              "polyfills": [
+                "zone.js"
+              ],
+              "tsConfig": "apps/@project.name@/tsconfig.app.json",
+              "assets": [
+                  "apps/@project.name@/src/favicon.ico",
+                  "apps/@project.name@/src/assets",
+                  {
+                      "glob": "**/*",
+                      "input": "node_modules/@eui/core/assets/",
+                      "output": "./assets"
+                  }
+              ],
+              "styles": [
+              ]
+          },
+          "configurations": {
+              "production": {
+                  "fileReplacements": [
+                      {
+                          "replace": "apps/@project.name@/src/_generated/environments/environment.ts",
+                          "with": "apps/@project.name@/src/_generated/environments/environment.prod.ts"
+                      }
+                  ],
+                  "outputHashing": "all",
+                  "budgets": [
+                      {
+                          "type": "initial",
+                          "maximumWarning": "2mb",
+                          "maximumError": "10mb"
+                      }
+                  ]
+              },
+              "production-optimized-no-openid": {
+                  "fileReplacements": [
+                      {
+                          "replace": "apps/@project.name@/src/_generated/environments/environment.ts",
+                          "with": "apps/@project.name@/src/_generated/environments/environment.prod.ts"
+                      }
+                  ],
+                  "optimization": {
+                    "scripts": true,
+                    "styles": {
+                        "minify": false,
+                        "inlineCritical": true
+                    },
+                    "fonts": true
+                  },
+                  "outputHashing": "all",
+                  "budgets": [
+                      {
+                          "type": "initial",
+                          "maximumWarning": "2mb",
+                          "maximumError": "10mb"
+                      }
+                  ]
+              },
+              "development": {
+                "optimization": false,
+                "extractLicenses": false,
+                "sourceMap": true
+              }
+          },
+          "defaultConfiguration": "production"
+      },
+      "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+              "browserTarget": "@project.name@:build"
+          },
+          "configurations": {
+              "proxy-mock": {
+                  "browserTarget": "@project.name@:build",
+                  "proxyConfig": "apps/@project.name@/proxy-mock.conf.json"
+              },
+              "production": {
+                  "browserTarget": "@project.name@:build:production"
+              },
+              "development": {
+                "browserTarget": "@project.name@:build:development"
+              }
+          },
+          "defaultConfiguration": "development"
+      }
+  }
+};
+
+
+
 
 
 module.exports.angularProjectDefConfiguration = {

package/scripts/csdr/init/resources/15.x/resolutions.json

@@ -1,5 +1,6 @@
 {
     "cacheable-request": ">=10.2.7",
     "fast-xml-parser": ">=4.2.4",
-    "get-stream": "6.0.1"
+    "get-stream": "6.0.1",
+    "socket.io": ">=4.7.2"
 }

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

@@ -0,0 +1,52 @@
+// ANGULAR & 3rd PARTIES
+import { NgModule } from '@angular/core';
+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 { TranslateModule } from '@ngx-translate/core';
+
+// eUI IMPORTS
+import {
+    CoreModule, CoreModuleEffects, translateConfig, EUI_CONFIG_TOKEN,
+} from '@eui/core';
+import { EuiAllModule } from '@eui/components';
+
+import { appConfig } from '../config/index';
+import { environment } from '../environments/environment';
+
+// APP ROUTES & ROOT COMPONENTS
+import { AppRoutingModule } from '../../app/app-routing.module';
+import { AppComponent } from '../../app/app.component';
+
+import { TOKEN, reducerProvider, metaReducers, runtimeChecks } from './core/reducers/index';
+
+// APP ROOT MODULE
+@NgModule({
+    imports: [
+        BrowserModule,
+        BrowserAnimationsModule,
+        HttpClientModule,
+        StoreModule.forRoot(TOKEN, { metaReducers, runtimeChecks }),
+        StoreDevtoolsModule.instrument({ name: 'CSDR App', maxAge: 150, logOnly: environment.production }),
+        EffectsModule.forRoot([...CoreModuleEffects]),
+        TranslateModule.forRoot(translateConfig),
+        CoreModule.forRoot(),
+        AppRoutingModule,
+        EuiAllModule,
+    ],
+    declarations: [
+        AppComponent,
+    ],
+    providers: [
+        { provide: EUI_CONFIG_TOKEN, useValue: { appConfig: appConfig, environment: environment } },
+        reducerProvider,
+    ],
+    bootstrap: [
+        AppComponent,
+    ],
+})
+export class AppModule {
+}

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

@@ -0,0 +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,
+};

package/scripts/utils/pre-build/injection/app-sources-full-skeleton-eui17/src/_generated/config/global.ts

@@ -0,0 +1,4 @@
+import { GlobalConfig } from '@eui/core';
+
+export const GLOBAL: GlobalConfig = {
+};

package/scripts/utils/pre-build/injection/app-sources-full-skeleton-eui17/src/_generated/config/index.ts

@@ -0,0 +1,8 @@
+import { EuiAppConfig } from '@eui/core';
+import { GLOBAL } from './global';
+import { MODULES } from './modules';
+
+export const appConfig: EuiAppConfig = {
+    global: GLOBAL,
+    modules: MODULES,
+};

package/scripts/utils/pre-build/injection/app-sources-full-skeleton-eui17/src/_generated/config/modules.ts

@@ -0,0 +1,4 @@
+import { ModulesConfig } from '@eui/core';
+
+export const MODULES: ModulesConfig = {
+};

package/scripts/utils/pre-build/injection/app-sources-full-skeleton-eui17/src/_generated/environments/environment.dev.ts

@@ -0,0 +1,9 @@
+// activated by running :
+// npm run build -- --configuration=dev
+// OR
+// npm run build-dev
+
+export const environment = {
+    production: false,
+    enableDevToolRedux: true,
+};

package/scripts/utils/pre-build/injection/app-sources-full-skeleton-eui17/src/_generated/environments/environment.prod.ts

@@ -0,0 +1,9 @@
+import { EuiEnvConfig } from '@eui/core';
+
+export const environment: EuiEnvConfig = {
+    production: true,
+    enableDevToolRedux: false,
+    envDynamicConfig: {
+        uri: 'assets/config/env-json-config.json',
+    },
+};

package/scripts/utils/pre-build/injection/app-sources-full-skeleton-eui17/src/_generated/environments/environment.ts

@@ -0,0 +1,21 @@
+// used by serve / when no configuration is provided on the build script
+// run npm run build
+
+import { EuiEnvConfig } from '@eui/core';
+
+export const environment: EuiEnvConfig = {
+    production: false,
+    enableDevToolRedux: true,
+    envDynamicConfig: {
+        uri: 'assets/config/env-json-config.json',
+    },
+};
+
+/*
+ * For easier debugging in development mode, you can import the following file
+ * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
+ *
+ * This import should be commented out in production mode because it will have a negative impact
+ * on performance if an error is thrown.
+ */
+// import 'zone.js/dist/zone-error';  // Included with Angular CLI.

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

@@ -0,0 +1,21 @@
+import { enableProdMode } from '@angular/core';
+import { preInitApp } from '@eui/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app/app.module';
+import { environment } from './environments/environment';
+import { ApplicationRef } from '@angular/core';
+import { enableDebugTools } from '@angular/platform-browser';
+
+if (environment.production) {
+    enableProdMode();
+}
+preInitApp(environment).then(() => {
+    platformBrowserDynamic().bootstrapModule(AppModule)
+        .then(moduleRef => {
+            const applicationRef = moduleRef.injector.get(ApplicationRef);
+            const componentRef = applicationRef.components[0];
+            enableDebugTools(componentRef);
+        })
+        .catch(err => console.log(err));
+});

package/scripts/utils/pre-build/injection/app-sources-full-skeleton-eui17/tsconfig.app.json

@@ -0,0 +1,27 @@
+{
+    "extends": "../../tsconfig.json",
+    "compilerOptions": {
+      "outDir": "./dist",
+      "types": [],
+      "target": "ES2022",
+      "module": "ES2022",
+      "lib": [
+        "ES2022",
+        "dom"
+      ]
+    },
+    "angularCompilerOptions": {
+        "annotateForClosureCompiler": true,
+        "strictTemplates": true,
+        "strictInjectionParameters": true,
+    },
+    "exclude": [
+      "test.ts",
+      "**/*.spec.ts",
+      "_todo/**/*.ts",
+      "**/_todo/**/*.ts",
+      "src/assets/samples/**/*.ts",
+      "dist/assets/samples/**/*.ts"
+    ],
+    "include": ["**/*.ts"]
+  }

package/scripts/utils/pre-build/injection/app-sources-full-skeleton-eui17/tsconfig.spec.json

@@ -0,0 +1,9 @@
+{
+    "extends": "../../tsconfig.json",
+    "compilerOptions": {
+      "outDir": "./dist",
+      "types": ["jasmine", "node"]
+    },
+    "files": ["src/test.ts", "src/polyfills.ts"],
+    "include": ["**/*.spec.ts", "**/*.d.ts"]
+  }

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

@@ -56,14 +56,19 @@ module.exports.injectCsdrFullSkeletonSources = (project, euiVersion) => {
       // copying skeleton sources
       if (euiVersion === '13.x') {
         tools.copydir(path.join(__dirname, 'app-sources-full-skeleton-eui13'), project.folder, false);
-      } else if (euiVersion === '14.x' || euiVersion === '15.x' || euiVersion === '16.x' || euiVersion === '17.x') {
+        tools.move(path.join(project.folder, 'src', '_generated', 'tst.ts'), path.join(project.folder, 'src', '_generated', 'test.ts'));
+
+      } else if (euiVersion === '14.x' || euiVersion === '15.x' || euiVersion === '16.x') {
         tools.copydir(path.join(__dirname, 'app-sources-full-skeleton-eui14'), project.folder, false);
+        tools.move(path.join(project.folder, 'src', '_generated', 'tst.ts'), path.join(project.folder, 'src', '_generated', 'test.ts'));
+
+      } else if (euiVersion === '17.x') {
+        tools.copydir(path.join(__dirname, 'app-sources-full-skeleton-eui17'), project.folder, false);
+
       } else {
         tools.copydir(path.join(__dirname, 'app-sources-full-skeleton'), project.folder, false);
+        tools.move(path.join(project.folder, 'src', '_generated', 'tst.ts'), path.join(project.folder, 'src', '_generated', 'test.ts'));
       }
-
-      // renaming tst.ts as it's conflicting with Jest... (TODO)
-      tools.move(path.join(project.folder, 'src', '_generated', 'tst.ts'), path.join(project.folder, 'src', '_generated', 'test.ts'));
     })
 
     .catch((e) => {