@eui/tools 6.17.1 → 6.19.0

package/.version.properties

@@ -1 +1 @@
-6.17.1
+6.19.0

package/CHANGELOG.md

@@ -1,3 +1,28 @@
+## 6.19.0 (2024-07-25)
+
+##### Chores
+
+* **other:**
+  * adapted wrong path check  ([95030187](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/9503018748e091defe17bb186a740bdd9bc9d768))
+##### New Features
+
+* **other:**
+  * adapted to new config for baep standalone portal - adjusted esbuild for proxied configurations - EUI-9788 [EUI-9788](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9788)  ([cf062fc3](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/cf062fc35fda5423fcf136e556779d7c4012a77d))
+
+* * *
+* * *
+## 6.18.0 (2024-07-24)
+
+##### New Features
+
+* **remotes:**
+  * minor change MWP-11061 [MWP-11061](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-11061)  ([e7168ead](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/e7168ead5b2a841773d570efb1ed7de3e756d921))
+  * enable zoneless for esbuild builds MWP-11061 [MWP-11061](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-11061)  ([df766769](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/df766769d4498b4d83fbdf259bd185b47e9ac364))
+  * tweak components to make them OnPush MWP-11061 [MWP-11061](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-11061)  ([50040270](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/5004027099447f321dafc74f0a634eafc20cc7f6))
+  * tweak the config in order to see if remotes-build using esbuild are fine. These changes work fine with webpack! [MWP-11061](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-11061)  ([15d905d6](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/15d905d62d964f26840409775d9f80f26402816d))
+
+* * *
+* * *
 ## 6.17.1 (2024-07-19)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/config/angular.js

@@ -26,9 +26,11 @@ const {
   angularProjectDefFullSkeletonV17esbuild,
   angularProjectDefConfiguration,
   angularProjectDefConfigurationHost,
+  angularProjectDefConfigurationHostEsbuild,
   angularProjectDefConfigurationLight,
   angularProjectDefConfigurationOptimized,
   angularProjectDefConfigurationOptimizedHost,
+  angularProjectDefConfigurationOptimizedHostEsbuild,
   angularProjectDefConfigurationOptimizedLight,
   angularPackageDef,
   angularPackageSubEntryDef,
@@ -321,8 +323,13 @@ module.exports.registerAngularProjectDef = (project, build = false, element = fa
         } else {
           tools.logInfo('Injecting angular configuration file replacement');
           if (project.host) {
-            configurationDef = JSON.stringify(angularProjectDefConfigurationHost);
-            configurationDefOptimized = JSON.stringify(angularProjectDefConfigurationOptimizedHost);
+            if (packageEuiVersionNumber >= 18) {
+              configurationDef = JSON.stringify(angularProjectDefConfigurationHostEsbuild);
+              configurationDefOptimized = JSON.stringify(angularProjectDefConfigurationOptimizedHostEsbuild);
+            } else {
+              configurationDef = JSON.stringify(angularProjectDefConfigurationHost);
+              configurationDefOptimized = JSON.stringify(angularProjectDefConfigurationOptimizedHost);
+            }
           } else {
             configurationDef = JSON.stringify(angularProjectDefConfiguration);
             configurationDefOptimized = JSON.stringify(angularProjectDefConfigurationOptimized);
@@ -393,7 +400,12 @@ module.exports.registerModulePaths = (pkg, isReset) => {
   const fileDev = path.join(process.cwd(), 'tsconfig.json');
   const fileBuild = path.join(process.cwd(), 'tsconfig.build.json');
   const fileBuildSpec = path.join(process.cwd(), 'tsconfig.build.spec.json');
-  const defFile = path.join(process.cwd(), '.csdr', '.euirc-csdr-apps.json');
+  let defFile;
+  if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+    defFile = path.join(process.cwd(), '.config', '.euirc-apps.json');
+  } else {
+    defFile = path.join(process.cwd(), '.csdr', '.euirc-csdr-apps.json');
+  }
 
   if ((!tools.isFileExists(fileBuild) || isReset) && !tools.isFileExists(defFile)) {
     tools.copy(fileDev, fileBuild);

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

@@ -1496,18 +1496,18 @@ module.exports.angularProjectDefFullSkeletonV17esbuild = {
       "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-              "browserTarget": "@project.name@:build"
+              "buildTarget": "@project.name@:build"
           },
           "configurations": {
               "proxy-mock": {
-                  "browserTarget": "@project.name@:build",
+                  "buildTarget": "@project.name@:build",
                   "proxyConfig": "apps/@project.name@/proxy-mock.conf.json"
               },
               "production": {
-                  "browserTarget": "@project.name@:build:production"
+                  "buildTarget": "@project.name@:build:production"
               },
               "development": {
-                "browserTarget": "@project.name@:build:development"
+                "buildTarget": "@project.name@:build:development"
               }
           },
           "defaultConfiguration": "development"
@@ -1560,6 +1560,49 @@ module.exports.angularProjectDefConfigurationHost = {
   "namedChunks": true
 };
 
+module.exports.angularProjectDefConfigurationOptimizedHost = {
+  "optimization": true,
+  "outputHashing": "all",
+  "sourceMap": false,
+  "extractCss": true,
+  "namedChunks": true,
+  "aot": true,
+  "extractLicenses": true,
+  "vendorChunk": false,
+  "buildOptimizer": true,
+  "budgets": [
+      {
+          "type": "initial",
+          "maximumWarning": "2mb",
+          "maximumError": "8mb"
+      }
+  ]
+}
+
+module.exports.angularProjectDefConfigurationHostEsbuild = {
+  "optimization": false,
+  "extractLicenses": false,
+  "sourceMap": true,
+  "namedChunks": true
+};
+
+module.exports.angularProjectDefConfigurationOptimizedHostEsbuild = {
+  "optimization": true,
+  "outputHashing": "all",
+  "sourceMap": false,
+  "extractCss": true,
+  "namedChunks": true,
+  "aot": true,
+  "extractLicenses": true,
+  "budgets": [
+      {
+          "type": "initial",
+          "maximumWarning": "2mb",
+          "maximumError": "8mb"
+      }
+  ]
+}
+
 
 module.exports.angularProjectDefConfigurationLight = {
   "buildOptimizer": false,
@@ -1618,24 +1661,7 @@ module.exports.angularProjectDefConfigurationOptimized = {
   ]
 }
 
-module.exports.angularProjectDefConfigurationOptimizedHost = {
-  "optimization": true,
-  "outputHashing": "all",
-  "sourceMap": false,
-  "extractCss": true,
-  "namedChunks": true,
-  "aot": true,
-  "extractLicenses": true,
-  "vendorChunk": false,
-  "buildOptimizer": true,
-  "budgets": [
-      {
-          "type": "initial",
-          "maximumWarning": "2mb",
-          "maximumError": "8mb"
-      }
-  ]
-}
+
 
 
 

package/scripts/csdr/config/global.js

@@ -13,10 +13,20 @@ const innerProjects = require('./projects');
 
 
 module.exports.getCsdrConfig = (full = true) => {
-  const globalConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-config.json'));
-  const appsConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-apps.json'));
-  const packagesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json'));
-  const remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
+  let globalConfig, appsConfig, packagesConfig, remotesConfig;
+
+  if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+    globalConfig = require(path.join(process.cwd(), '.config', '.euirc-config.json'));
+    appsConfig = require(path.join(process.cwd(), '.config', '.euirc-apps.json'));
+    packagesConfig = require(path.join(process.cwd(), '.config', '.euirc-packages.json'));
+    remotesConfig = require(path.join(process.cwd(), '.config', '.euirc-remotes.json'));
+
+  } else {
+    globalConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-config.json'));
+    appsConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-apps.json'));
+    packagesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json'));
+    remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
+  }
 
   const config = globalConfig;
 
@@ -147,9 +157,13 @@ const getConfig = module.exports.getConfig = () => {
   let configFile;
   let isCsdr;
 
-  if (tools.isDirExists(path.join(process.cwd(), '.csdr'))) {
-    configFile = path.join(process.cwd(), '.csdr', '.euirc.json');
+  if (tools.isDirExists(path.join(process.cwd(), '.csdr')) || tools.isDirExists(path.join(process.cwd(), '.config'))) {
     isCsdr = true;
+    if (tools.isDirExists(path.join(process.cwd(), '.csdr'))) {
+      configFile = path.join(process.cwd(), '.csdr', '.euirc.json');
+    } else {
+      configFile = path.join(process.cwd(), '.config', '.euirc.json');
+    }
   } else {
     configFile = path.join(process.cwd(), '.euirc.json');
     isCsdr = false;
@@ -174,7 +188,13 @@ module.exports.updateConfig = (args = { project, projects, packages, packagesBra
   tools.logInfo('Updating euirc config');
   console.log(args);
 
-  const configFile = path.join(process.cwd(), '.csdr', '.euirc.json');
+  let configFile;
+
+  if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+    configFile = path.join(process.cwd(), '.config', '.euirc.json');
+  } else {
+    configFile = path.join(process.cwd(), '.csdr', '.euirc.json');
+  }
 
   let newConfig = {};
 

package/scripts/csdr/config/packages.js

@@ -244,7 +244,13 @@ module.exports.getRemotePackages = () => {
 };
 
 module.exports.isRemote = (pkgName) => {
-  const packagesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json'));
+  let packagesConfig;
+
+  if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+    packagesConfig = require(path.join(process.cwd(), '.config', '.euirc-packages.json'));
+  } else {
+    packagesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json'));
+  }
   const packageConfig = packagesConfig[pkgName];
 
   if (packageConfig) {

package/scripts/csdr/config/register.js

@@ -92,9 +92,17 @@ module.exports.registerCsdrPackage = (pkg, rootPkgScope, rootPkgName, euiVersion
 
   let file;
   if (isRemote) {
-    file = path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json');
+    if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+      file = path.join(process.cwd(), '.config', '.euirc-remotes.json');
+    } else {
+      file = path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json');
+    }
   } else {
-    file = path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json');
+    if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+      file = path.join(process.cwd(), '.config', '.euirc-packages.json');
+    } else {
+      file = path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json');
+    }
   }
 
   const moduleJson = JSON.parse(replaceModule);

package/scripts/csdr/config/remotes.js

@@ -18,7 +18,12 @@ module.exports.getRemote = (remoteName) => {
     remoteName = tools.getArgs().root;
   }
 
-  const remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
+  let remotesConfig;
+  if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+    remotesConfig = require(path.join(process.cwd(), '.config', '.euirc-remotes.json'));
+  } else {
+    remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
+  }
   const remoteConfig = remotesConfig[remoteName];
 
   const configOptions = configUtils.global.getConfigOptions();
@@ -71,7 +76,14 @@ module.exports.getRemote = (remoteName) => {
 
 
 module.exports.isVirtualRemote = (remoteName) => {
-  const remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
+  let remotesConfig;
+  console.log(tools.isDirExists())
+  if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+    remotesConfig = require(path.join(process.cwd(), '.config', '.euirc-remotes.json'));
+  } else {
+    remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
+  }
+
   const remoteConfig = remotesConfig[remoteName];
 
   return remoteConfig !== undefined;
@@ -111,7 +123,13 @@ module.exports.getCsdrRemotes = (hostName, euiVersion) => {
     tools.logInfo(`--- for euiVersion: ${euiVersion}`);
   }
 
-  const remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
+  let remotesConfig;
+  if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+    remotesConfig = require(path.join(process.cwd(), '.config', '.euirc-remotes.json'));
+  } else {
+    remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
+  }
+
   let remotesArray = Object.keys(remotesConfig).map((r) => {
     const remote = remotesConfig[r];
     remote.name = r;

package/scripts/csdr/config/sync.js

@@ -74,6 +74,9 @@ module.exports.run = () => {
     packages: pkgFolders,
     remotes: remoteFolders
   };
-
-  tools.writeJsonFileSync(path.join(process.cwd(), '.csdr', '.euirc.json'), config);
+  if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+    tools.writeJsonFileSync(path.join(process.cwd(), '.config', '.euirc.json'), config);
+  } else {
+    tools.writeJsonFileSync(path.join(process.cwd(), '.csdr', '.euirc.json'), config);
+  }
 }

package/scripts/csdr/init/packages.js

@@ -83,6 +83,7 @@ module.exports.cloneHostPackage = (projectName) => {
 
   return Promise.resolve()
     .then(() => {
+      tools.logInfo(`Fetching host package info : ${project.hostPackage}`);
       pkg = configUtils.packages.getPackageByNpmPkg(project.hostPackage, true);
       if (!pkg) {
         throw new Error('Invalid host package provided / unknown to CSDR config');

package/scripts/csdr/init/remotes/18.x/base/angular.esbuild.json

@@ -3,80 +3,71 @@
     "version": 1,
     "newProjectRoot": "apps",
     "projects": {
-      "@remote.name@": {
-        "root": ".",
-        "sourceRoot": "src",
-        "projectType": "application",
-        "prefix": "app",
-        "schematics": {},
-        "architect": {
-          "build": {
-            "builder": "@angular-devkit/build-angular:application",
-            "options": {
-              "outputPath": "dist",
-              "index": "src/index.html",
-              "browser": "src/main.ts",
-              "polyfills": ["zone.js"],
-              "tsConfig": "tsconfig.app.json",
-              "sourceMap": {
-                "scripts": true,
-                "styles": false,
-                "hidden": true,
-                "vendor": true
-              },
-              "scripts": [
-              ],
-              "assets": [
-                "src/assets",
-                {
-                    "glob": "**/*",
-                    "input": "node_modules/@eui/core/assets/",
-                    "output": "./assets"
-                },
-                {
-                    "glob": "**/*",
-                    "input": "node_modules/@eui/styles/dist/assets/",
-                    "output": "./assets"
+        "@remote.name@": {
+            "root": ".",
+            "sourceRoot": "src",
+            "projectType": "application",
+            "prefix": "app",
+            "schematics": {},
+            "architect": {
+                "build": {
+                    "builder": "@angular-devkit/build-angular:application",
+                    "options": {
+                        "outputPath": "dist",
+                        "index": "src/index.html",
+                        "browser": "src/main.ts",
+                        "polyfills": [
+                        ],
+                        "tsConfig": "tsconfig.app.json",
+                        "scripts": [
+                        ],
+                        "assets": [
+                            "src/assets",
+                            {
+                                "glob": "**/*",
+                                "input": "node_modules/@eui/core/assets/",
+                                "output": "./assets"
+                            },
+                            {
+                                "glob": "**/*",
+                                "input": "node_modules/@eui/styles/dist/assets/",
+                                "output": "./assets"
+                            }
+                        ],
+                        "styles": [
+                            "node_modules/@eui/styles/dist/styles/eui.css",
+                            "node_modules/@eui/styles/dist/styles/eui-extra-utilities.css",
+                            "node_modules/@eui/styles/dist/styles/eui-legacy-bootstrap.css",
+                            "node_modules/@eui/styles/dist/styles/eui-legacy-icons-font.css",
+                            "node_modules/@eui/styles/dist/styles/eui-legacy-utilities.css"
+                        ]
+                    },
+                    "configurations": {
+                        "development": {
+                            "optimization": false,
+                            "extractLicenses": false,
+                            "sourceMap": false,
+                            "namedChunks": true
+                        },
+                        "production": {
+                            "fileReplacements": [
+                                {
+                                    "replace": "src/environments/environment.ts",
+                                    "with": "src/environments/environment.prod.ts"
+                                }
+                            ],
+                            "outputHashing": "none",
+                            "sourceMap": false
+                        },
+                        "serve-dist": {
+                            "outputPath": "serve-dist"
+                        }
+                    }
                 }
-              ],
-              "styles": [
-                  "node_modules/@eui/styles/dist/styles/eui.css",
-                  "node_modules/@eui/styles/dist/styles/eui-extra-utilities.css",
-                  "node_modules/@eui/styles/dist/styles/eui-legacy-bootstrap.css",
-                  "node_modules/@eui/styles/dist/styles/eui-legacy-icons-font.css",
-                  "node_modules/@eui/styles/dist/styles/eui-legacy-utilities.css"
-              ]
-            },
-            "configurations": {
-              "development": {
-                "optimization": false,
-                "extractLicenses": false,
-                "sourceMap": false,
-                "namedChunks": true
-              },
-              "production": {
-                "fileReplacements": [
-                  {
-                    "replace": "src/environments/environment.ts",
-                    "with": "src/environments/environment.prod.ts"
-                  }
-                ],
-                "optimization": true,
-                "outputHashing": "all",
-                "sourceMap": false,
-                "namedChunks": false,
-                "aot": true,
-                "extractLicenses": true
-              },
-              "serve-dist": {
-                "outputPath": "serve-dist"
-              }
             }
-          }
         }
-      }
     },
     "cli": {
-      "analytics": false
+        "analytics": false
     }
-  }
+}

package/scripts/csdr/init/remotes/18.x/base/tsconfig.app.json

@@ -1,24 +1,37 @@
 {
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "outDir": "./out-tsc/app",
-    "target": "ES2022",
-    "module": "ES2022",
-    "lib": [
-      "ES2022",
-      "dom"
-    ],
-    "types": [
-        "node"
-    ],
-    "paths": {
-        "os": ["./node_modules/empty-module/index.js"],
-        "node-fetch": ["./node_modules/empty-module/index.js"],
-        "zipkin": ["./node_modules/zipkin/dist/zipkin.js"]
-    }
-  },
-  "exclude": [
-    "src/test.ts",
-    "**/*.spec.ts"
-  ]
+    "extends": "../../tsconfig.json",
+    "compilerOptions": {
+        "outDir": "./out-tsc/app",
+        "target": "ES2022",
+        "module": "ES2022",
+        "skipLibCheck": true,
+        "esModuleInterop": true,
+        "declaration": false,
+        "experimentalDecorators": true,
+        "moduleResolution": "bundler",
+        "importHelpers": true,
+        "sourceMap": true,
+        "lib": [
+            "ES2022",
+            "dom"
+        ],
+        "types": [
+            "node"
+        ],
+        "paths": {
+            "os": [
+                "./node_modules/empty-module/index.js"
+            ],
+            "node-fetch": [
+                "./node_modules/empty-module/index.js"
+            ],
+            "zipkin": [
+                "./node_modules/zipkin/dist/zipkin.js"
+            ]
+        }
+    },
+    "exclude": [
+        "src/test.ts",
+        "**/*.spec.ts"
+    ]
 }

package/scripts/csdr/init/remotes/18.x/full/common/app/fallback.component.ts

@@ -1,6 +1,7 @@
-import { Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component } from '@angular/core';
 
 @Component({
+    changeDetection: ChangeDetectionStrategy.OnPush,
     template: `
         <eui-block-content [isBlocked]="true">
             <div style="height: 100%"></div>

package/scripts/csdr/init/remotes/18.x/full/common/app/module.component.ts

@@ -1,26 +1,25 @@
-import { Component, OnInit, ElementRef, OnDestroy, inject } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, inject, OnDestroy, OnInit, signal } from '@angular/core';
 
 import { Subscription } from 'rxjs';
 import { first } from 'rxjs/operators';
 
 import { CONFIG_TOKEN } from '@eui/core';
-import { ElementSetupService, ElementLifeCycleService } from '@csdr/integration/element';
+import { ElementLifeCycleService, ElementSetupService } from '@csdr/integration/element';
 
-enum ElementStatus {
-    Loading = 'loading',
-    Loaded = 'loaded',
-    Error = 'error',
-}
+type StatusType = 'Loading' | 'Loaded' | 'Failed';
 
 @Component({
+    changeDetection: ChangeDetectionStrategy.OnPush,
     template: `
-        <eui-block-content *ngIf="moduleStatus === ElementStatus.Loading" [isBlocked]="true">
-            <div style="height: 100%"></div>
-        </eui-block-content>
-        <ng-container *ngIf="moduleStatus === ElementStatus.Loaded">
+        @if (status() === 'Loaded') {
             <router-outlet></router-outlet>
-        </ng-container>
-        <ng-container *ngIf="moduleStatus === ElementStatus.Error">
+        }
+        @if (status() === 'Loading') {
+            <eui-block-content [isBlocked]="true">
+                <div style="height: 100%"></div>
+            </eui-block-content>
+        }
+        @if (status() === 'Failed') {
             <div class="error-container">
                 <div>
                     <h1>Translations or user data for this module failed to load.</h1>
@@ -30,8 +29,7 @@ enum ElementStatus {
                     </button>
                 </div>
             </div>
-        </ng-container>
-    `,
+        }`,
     styles: [`
         .error-container {
             width: 50vw;
@@ -48,10 +46,9 @@ enum ElementStatus {
     `],
 })
 export class ModuleComponent implements OnInit, OnDestroy {
-    ElementStatus = ElementStatus;
-    moduleStatus: ElementStatus;
+    status = signal<StatusType | undefined>(undefined);
 
-    private initSubscription: Subscription;
+    private initSubscription: Subscription | undefined = undefined;
 
     private elRef = inject(ElementRef);
     private config = inject(CONFIG_TOKEN);
@@ -69,8 +66,8 @@ export class ModuleComponent implements OnInit, OnDestroy {
         this.elementLifeCycleService.cleanup();
     }
 
-    private loadData() {
-        this.setStatus(ElementStatus.Loading);
+    loadData() {
+        this.status.set('Loading');
         try {
             this.initSubscription?.unsubscribe();
 
@@ -79,19 +76,15 @@ export class ModuleComponent implements OnInit, OnDestroy {
                 .pipe(first())
                 .subscribe((loadStatus: { success: boolean; error?: string }) => {
                     if (!loadStatus.success) {
-                        this.setStatus(ElementStatus.Error);
+                        this.status.set('Failed');
                         console.error(`[ELEMENT: ${this.config.global.elementName}] `, loadStatus.error);
                     } else {
-                        this.setStatus(ElementStatus.Loaded);
+                        this.status.set('Loaded');
                     }
                 });
         } catch (e) {
             console.log(e);
-            this.setStatus(ElementStatus.Error);
+            this.status.set('Failed');
         }
     }
-
-    private setStatus(status: ElementStatus) {
-        this.moduleStatus = status;
-    }
 }

package/scripts/csdr/init/remotes/18.x/full/options/participant/app/module.component.ts

@@ -1,37 +1,35 @@
-import { Component, OnInit, Inject, ElementRef, OnDestroy } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, inject, OnDestroy, OnInit, signal } from '@angular/core';
 
 import { Subscription } from 'rxjs';
 import { first } from 'rxjs/operators';
 
 import { CONFIG_TOKEN } from '@eui/core';
-import { ElementSetupService, ElementLifeCycleService } from '@csdr/integration/element';
+import { ElementLifeCycleService, ElementSetupService } from '@csdr/integration/element';
 
-enum ElementStatus {
-    Loading = 'loading',
-    Loaded = 'loaded',
-    Error = 'error',
-}
+type StatusType = 'Loading' | 'Loaded' | 'Failed';
 
 @Component({
+    changeDetection: ChangeDetectionStrategy.OnPush,
     template: `
-        <eui-block-content *ngIf="moduleStatus === ElementStatus.Loading" [isBlocked]="true">
-            <div style="height: 100%"></div>
-        </eui-block-content>
-        <ng-container *ngIf="moduleStatus === ElementStatus.Loaded">
+        @if (status() === 'Loaded') {
             <!-- BLOCK_CONTAINER_PLACEHOLDER -->
-        </ng-container>
-        <ng-container *ngIf="moduleStatus === ElementStatus.Error">
+        }
+        @if (status() === 'Loading') {
+            <eui-block-content [isBlocked]="true">
+                <div style="height: 100%"></div>
+            </eui-block-content>
+        }
+        @if (status() === 'Failed') {
             <div class="error-container">
                 <div>
                     <h1>Translations or user data for this module failed to load.</h1>
                     <p>Do you want to try again?</p>
                     <button euiButton euiPrimary (click)="loadData()">
-                        <span euiLabel>{{ "global.RELOAD" | translate }}</span>
+                        <span euiLabel>{{ 'global.RELOAD' | translate }}</span>
                     </button>
                 </div>
             </div>
-        </ng-container>
-    `,
+        }`,
     styles: [`
         .error-container {
             width: 50vw;
@@ -48,18 +46,16 @@ enum ElementStatus {
     `],
 })
 export class ModuleComponent implements OnInit, OnDestroy {
-    ElementStatus = ElementStatus;
-    moduleStatus: ElementStatus;
+    status = signal<StatusType | undefined>(undefined);
 
     block: any;
 
-    private initSubscription: Subscription;
+    private initSubscription: Subscription | undefined = undefined;
 
-    constructor(private elRef: ElementRef,
-                @Inject(CONFIG_TOKEN) public config: any,
-                private elementLifeCycleService: ElementLifeCycleService,
-                private elementSetupService: ElementSetupService) {
-    }
+    private elRef = inject(ElementRef);
+    private config = inject(CONFIG_TOKEN);
+    private elementLifeCycleService = inject(ElementLifeCycleService);
+    private elementSetupService = inject(ElementSetupService);
 
     ngOnInit() {
         this.block = this.elRef.nativeElement.block;
@@ -73,8 +69,8 @@ export class ModuleComponent implements OnInit, OnDestroy {
         this.elementLifeCycleService.cleanup();
     }
 
-    private loadData() {
-        this.setStatus(ElementStatus.Loading);
+    loadData() {
+        this.status.set('Loading');
         try {
             this.initSubscription?.unsubscribe();
 
@@ -83,19 +79,15 @@ export class ModuleComponent implements OnInit, OnDestroy {
                 .pipe(first())
                 .subscribe((loadStatus: { success: boolean, error?: string }) => {
                     if (!loadStatus.success) {
-                        this.setStatus(ElementStatus.Error);
+                        this.status.set('Failed');
                         console.error(`[ELEMENT: ${this.config.global.elementName}] `, loadStatus.error);
                     } else {
-                        this.setStatus(ElementStatus.Loaded);
+                        this.status.set('Loaded');
                     }
                 });
         } catch (e) {
             console.log(e);
-            this.setStatus(ElementStatus.Error);
+            this.status.set('Failed');
         }
     }
-
-    private setStatus(status: ElementStatus) {
-        this.moduleStatus = status;
-    }
 }

package/scripts/csdr/metadata/package-utils.js

@@ -25,10 +25,17 @@ const getPackageVersions = (module.exports.getPackageVersions = (pkg) => {
   } catch(e) {
     npmOutput = e.stdout;
   }
-  const json = JSON.parse(npmOutput);
+  // console.log(npmOutput);
 
   let versions = [];
 
+  if (!npmOutput) {
+    tools.logWarning('Cannot find version of pkg - package is probably not published yet');
+    return versions;
+  }
+
+  const json = JSON.parse(npmOutput);
+
   if (json.error) {
     tools.logWarning('Error detected while trying to fetch the pkg version');
     console.log(json.error);

package/scripts/csdr/sync/sync-utils.js

@@ -17,7 +17,12 @@ module.exports.sync = () => {
   return Promise.resolve()
   .then(() => {
     tools.logInfo('Resetting package.json');
-    return tools.copy(path.join(process.cwd(), '.csdr', 'package.json.reset'), path.join(process.cwd(), 'package.json'));
+
+    if (tools.isDirExists(path.join(process.cwd(), '.config'))) {
+      return tools.copy(path.join(process.cwd(), '.config', 'package.json.reset'), path.join(process.cwd(), 'package.json'));
+    } else {
+      return tools.copy(path.join(process.cwd(), '.csdr', 'package.json.reset'), path.join(process.cwd(), 'package.json'));
+    }
   })
   .then(() => {
     tools.logInfo('Removing yarn.lock');