@eui/tools 5.3.55 → 5.3.57

package/.version.properties

@@ -1 +1 @@
-5.3.55
+5.3.57

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 5.3.57 (2022-09-22)
+
+##### Chores
+
+* **other:**
+  * add base dependencies parsing for package - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([c688407e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/c688407e17bbbda1a962fb9db7557b0d36383076))
+
+* * *
+* * *
+## 5.3.56 (2022-09-22)
+
+##### Chores
+
+* **other:**
+  * mem-leaks improvements MWP-8671 [MWP-8671](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8671)  ([12e4df2c](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/12e4df2cc9cdfaffc112744e36fcedb5db24ba4d))
+
+* * *
+* * *
 ## 5.3.55 (2022-09-22)
 
 ##### Bug Fixes

package/package.json

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

package/scripts/csdr/cli/skeletons/package/frontend-remote-eui10/src/app/module.component.ts

@@ -47,8 +47,6 @@ enum ElementStatus {
     `],
 })
 export class ModuleComponent implements OnInit, OnDestroy {
-    remoteId: string;
-
     ElementStatus = ElementStatus;
     moduleStatus: ElementStatus;
 
@@ -59,8 +57,8 @@ export class ModuleComponent implements OnInit, OnDestroy {
     }
 
     ngOnInit() {
-        this.remoteId = this.elRef.nativeElement.remoteId;
-        this.elementLifeCycleService.setup(this.remoteId);
+        const elementData = this.elementLifeCycleService.getElementData(this.elRef);
+        this.elementLifeCycleService.setup(elementData);
         this.loadData();
     }
 

package/scripts/csdr/install/common.js

@@ -274,6 +274,57 @@ const getLocalPackagesCompositeDeps = () => {
 }
 
 
+const getLocalPackageBaseDeps = (pkg) => {
+  let pkgJsonFile;
+
+  if (!skipLocalPackagesDeps) {
+    if (pkg.child) {
+      pkgJsonFile = path.join(process.cwd(), 'packages', pkg.parentPkg, 'packages', pkg.folder || pkg.name, 'dependencies-base.json');
+    } else {
+      pkgJsonFile = path.join(process.cwd(), 'packages', pkg.name, 'dependencies-base.json');
+    }
+
+    if (tools.isFileExists(pkgJsonFile)) {
+      tools.logInfo(`found ${pkgJsonFile}, parsing...`);
+    }
+
+    return tools.getJsonFileContent(pkgJsonFile) || {};
+
+  } else {
+    tools.logInfo('Skipping gathering local packages base deps');
+
+    return {};
+  }
+}
+
+
+
+const getLocalPackagesBaseDeps = () => {
+  tools.logTitle('Parsing base deps for local packages');
+
+  let deps = {};
+
+  // getting locally mounted packages, don't take into account remotely installed packages (elements remote)
+  const packages = configUtils.packages.getPackages().filter((p) => {
+    return !p.paths.remoteNodeModules;
+  });
+
+  packages.forEach(p => {
+    tools.logInfo(`Parsing package : ${p.name}`);
+
+    // getting the package base if any
+    const baseDeps = getLocalPackageBaseDeps(p);
+
+    deps = { ...deps, ...baseDeps };
+
+    tools.logInfo('Deps found : ');
+    console.log(deps);
+  })
+
+  return deps;
+}
+
+
 const getLocalPackagesCompositeDepsRemapped = () => {
   return Promise.resolve()
     .then(() => {
@@ -477,6 +528,8 @@ module.exports = {
   getLocalPackageCompositeDeps,
   getLocalPackagesCompositeDeps,
   getLocalPackagesCompositeDepsRemapped,
+  getLocalPackageBaseDeps,
+  getLocalPackagesBaseDeps,
   getLocalProjectDeps,
   getLocalProjectsDeps,
   getLocalProjectFixedDeps,

package/scripts/csdr/install/packages.js

@@ -15,7 +15,7 @@ const innerProjects = require('./projects');
 
 
 module.exports.installDeps = (prj, pkg, isMaster) => {
-  let compositeDeps, localPkgDeps, localPkgCompositeDeps;
+  let compositeDeps, localPkgDeps, localPkgCompositeDeps, remappedDeps, localPkgBaseDeps;
 
   return Promise.resolve()
     .then(() => {
@@ -65,7 +65,16 @@ module.exports.installDeps = (prj, pkg, isMaster) => {
       return innerCommon.getRemappedDeps(depsMetadata, localPkgCompositeDeps, isMaster);
     })
 
-    .then((remappedLocalPkgCompositeDeps) => {
+    .then((remappedDepsIn) => {
+      // storing
+      remappedDeps = remappedDepsIn;
+
+      return innerCommon.getLocalPackagesBaseDeps();
+    })
+
+    .then((localPkgBaseDepsIn) => {
+      localPkgBaseDeps = localPkgBaseDepsIn;
+
       // fetching extra dependencies on project if any
       let prjDeps = {};
 
@@ -77,10 +86,10 @@ module.exports.installDeps = (prj, pkg, isMaster) => {
       const fixedDeps = configUtils.global.getConfig().npm.fixedDependencies;
 
       if (pkg.build && pkg.build.ownDepsOnly) {
-        return innerCommon.installDeps({ ...remappedLocalPkgCompositeDeps, ...localPkgDeps, ...fixedDeps});
+        return innerCommon.installDeps({ ...localPkgBaseDeps, ...remappedDeps, ...localPkgDeps, ...fixedDeps});
 
       } else {
-        return innerCommon.installDeps({ ...remappedLocalPkgCompositeDeps, ...localPkgDeps, ...prjDeps, ...compositeDeps, ...fixedDeps });
+        return innerCommon.installDeps({ ...localPkgBaseDeps, ...remappedDeps, ...localPkgDeps, ...prjDeps, ...compositeDeps, ...fixedDeps });
       }
     })