@eui/tools 5.3.24 → 5.3.27

package/.version.properties

@@ -1 +1 @@
-5.3.24
+5.3.27

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 5.3.27 (2022-06-29)
+
+##### Bug Fixes
+
+* **other:**
+  * removed packages injection config injection for MWP - adapted default config injection for MWP - MWP-7700 [MWP-7700](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7700)  ([a9ae69f4](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/a9ae69f49558b66afbf6e3ce9395148c924023c0))
+
+* * *
+* * *
+## 5.3.26 (2022-06-23)
+
+##### Chores
+
+* **other:**
+  * adapted for MWP v14 setup and migration - MWP-8474 [MWP-8474](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8474)  ([4fc90eca](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/4fc90eca36fe64366397bded27818675f17485f4))
+
+* * *
+* * *
+## 5.3.25 (2022-06-22)
+
+##### Bug Fixes
+
+* **other:**
+  * avoid removing assets path on app source injection - MWP-7700 [MWP-7700](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7700)  ([63b520d1](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/63b520d107bdfe4dd64f46bd6eb78943db71fc93))
+
+* * *
+* * *
 ## 5.3.24 (2022-06-21)
 
 ##### Bug Fixes

package/package.json

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

package/scripts/csdr/config/angular.js

@@ -6,6 +6,7 @@ const path = require('path');
 // LOCAL
 const tools = require('../../utils/tools');
 
+const innerPackages = require('./packages');
 
 
 const angularConfigDef = {
@@ -1307,12 +1308,21 @@ module.exports.registerAngularPackage = (pkg, isReset) => {
     pathBase = 'packages/' + pkg.parentPkg + '/packages';
   }
 
+  let packageEuiVersion;
+
+  if (pkg.build && pkg.build.euiVersion) {
+    packageEuiVersion = pkg.build.euiVersion;
+
+  } else {
+    packageEuiVersion = innerPackages.getPackageEuiVerison(pkg);
+  }
+
   let projectDef = JSON.stringify(angularPackageDef);
 
-  if (pkg.build && pkg.build.euiVersion === '13.x') {
+  if (packageEuiVersion === '13.x') {
     projectDef = JSON.stringify(angularPackageDefV13);
   }
-  if (pkg.build && pkg.build.euiVersion === '14.x') {
+  if (packageEuiVersion === '14.x') {
     projectDef = JSON.stringify(angularPackageDefV14);
   }
 

package/scripts/csdr/config/packages.js

@@ -243,52 +243,63 @@ module.exports.getDepGraph = () => {
 }
 
 
-module.exports.getLocalPackagesEuiVersion = () => {
-  tools.logTitle('getting local packages installed eUI version...');
-
-  const pkgs = getPackages();
-  let versionsFound = [];
-
-  pkgs.forEach((p) => {
-    if (p.parent !== true && p.tsPackage !== false) {
-      tools.logInfo(`checking ${p.name}`);
+const getPackageEuiVersion = module.exports.getPackageEuiVerison = (pkg) => {
+  if (pkg.parent !== true && pkg.tsPackage !== false) {
+    tools.logInfo(`checking ${pkg.name}`);
 
-      let version;
+    let version;
 
-      if (p.build && p.build.euiVersion) {
-        version = p.build.euiVersion;
+    if (pkg.build && pkg.build.euiVersion) {
+      version = pkg.build.euiVersion;
 
-      } else if (!p.remote) {
-        const depsCompositeFile = path.join(p.paths.pkgRootDirectory, 'dependencies-composite.json');
-        tools.logInfo(`Try fetching version from ${depsCompositeFile}`);
+    } else if (!pkg.remote) {
+      const depsCompositeFile = path.join(pkg.paths.pkgRootDirectory, 'dependencies-composite.json');
+      tools.logInfo(`Try fetching version from ${depsCompositeFile}`);
 
-        if (!tools.isFileExists(depsCompositeFile)) {
-          tools.logInfo('---- no dependencies-composite.json file found');
-        } else {
-          const deps = tools.getJsonFileContent(depsCompositeFile);
-          const euiDepsBase = deps['@eui/deps-base'];
+      if (!tools.isFileExists(depsCompositeFile)) {
+        tools.logInfo('---- no dependencies-composite.json file found');
+      } else {
+        const deps = tools.getJsonFileContent(depsCompositeFile);
+        const euiDepsBase = deps['@eui/deps-base'];
 
-          if (euiDepsBase) {
-            let euiVersion = euiDepsBase.split('.')[0];
+        if (euiDepsBase) {
+          let euiVersion = euiDepsBase.split('.')[0];
 
-            if (euiVersion.substr(0,1) === '^') {
-              euiVersion = euiVersion.substr(1);
-            }
-            version = `${euiVersion}.x`;
+          if (euiVersion.substr(0,1) === '^') {
+            euiVersion = euiVersion.substr(1);
+          }
+          version = `${euiVersion}.x`;
 
-            if (version === '7.x') {
-              version = 'DEFAULT';
-            }
+          if (version === '7.x') {
+            version = 'DEFAULT';
           }
         }
       }
+    }
 
-      if (version) {
-        tools.logInfo(`---- version found : ${version}\n`);
-        versionsFound.push(version);
-      } else {
-        tools.logInfo('---- version detection skipped');
-      }
+    if (version) {
+      tools.logInfo(`---- version found : ${version}\n`);
+    } else {
+      tools.logInfo('---- version detection skipped');
+    }
+
+    return version;
+  }
+}
+
+
+
+module.exports.getLocalPackagesEuiVersion = () => {
+  tools.logTitle('getting local packages installed eUI version...');
+
+  const pkgs = getPackages();
+  let versionsFound = [];
+
+  pkgs.forEach((p) => {
+    const version = getPackageEuiVersion(p);
+
+    if (version) {
+      versionsFound.push(version);
     }
   })
 

package/scripts/csdr/install/common.js

@@ -10,7 +10,7 @@ const configUtils = require('../config/config-utils');
 const metadataUtils = require('../metadata/metadata-utils');
 
 // FETCH ARGS
-const { dryRun, skipInstall, registry, remotesImport } = tools.getArgs();
+const { dryRun, skipInstall, registry, remotesImport, skipLocalPackagesDeps } = tools.getArgs();
 
 
 
@@ -227,17 +227,24 @@ const getLocalPackagesDeps = () => {
 const getLocalPackageCompositeDeps = (pkg) => {
   let pkgJsonFile;
 
-  if (pkg.child) {
-    pkgJsonFile = path.join(process.cwd(), 'packages', pkg.parentPkg, 'packages', pkg.folder || pkg.name, 'dependencies-composite.json');
+  if (!skipLocalPackagesDeps) {
+    if (pkg.child) {
+      pkgJsonFile = path.join(process.cwd(), 'packages', pkg.parentPkg, 'packages', pkg.folder || pkg.name, 'dependencies-composite.json');
+    } else {
+      pkgJsonFile = path.join(process.cwd(), 'packages', pkg.name, 'dependencies-composite.json');
+    }
+
+    if (tools.isFileExists(pkgJsonFile)) {
+      tools.logInfo(`found ${pkgJsonFile}, parsing...`);
+    }
+
+    return tools.getJsonFileContent(pkgJsonFile) || {};
+
   } else {
-    pkgJsonFile = path.join(process.cwd(), 'packages', pkg.name, 'dependencies-composite.json');
-  }
+    tools.logInfo('Skipping gathering local packages composite deps');
 
-  if (tools.isFileExists(pkgJsonFile)) {
-    tools.logInfo(`found ${pkgJsonFile}, parsing...`);
+    return {};
   }
-
-  return tools.getJsonFileContent(pkgJsonFile) || {};
 }
 
 

package/scripts/csdr/release/app/release-app.js

@@ -290,7 +290,7 @@ module.exports.run = () => {
       if (project.build && project.build.distribution) {
         return Promise.resolve()
           .then(() => {
-            return utils.buildApp.generateProjectDistributionFile(project, (isSnapshot || isSupportSnapshotBranch));
+            return utils.buildApp.generateProjectDistributionFile(project, (isSnapshot || isSupportSnapshotBranch), envTarget);
           })
           .catch((e) => {
             throw e;

package/scripts/utils/build/app/build-app-utils.js

@@ -270,7 +270,7 @@ module.exports.postBuild = (project) => {
 }
 
 
-module.exports.generateProjectDistributionFile = (project, isSnapshot) => {
+module.exports.generateProjectDistributionFile = (project, isSnapshot, envTarget) => {
   tools.logTitle('Generating distribution file');
 
   let projectVersion;
@@ -298,6 +298,36 @@ module.exports.generateProjectDistributionFile = (project, isSnapshot) => {
         if (isSnapshot && project.build.distribution.bucketNameSnapshot) {
           bucketName = project.build.distribution.bucketNameSnapshot;
         }
+
+        if (envTarget) {
+          if (envTarget === 'DEV' && project.build.distribution.bucketNameDev) {
+            bucketName = project.build.distribution.bucketNameDev;
+          }
+
+          if (envTarget === 'TST' && project.build.distribution.bucketNameTst) {
+            bucketName = project.build.distribution.bucketNameTst;
+          }
+
+          if (envTarget === 'INT' && project.build.distribution.bucketNameInt) {
+            bucketName = project.build.distribution.bucketNameInt;
+          }
+
+          if (envTarget === 'ACC' && project.build.distribution.bucketNameAcc) {
+            bucketName = project.build.distribution.bucketNameAcc;
+          }
+
+          if (envTarget === 'DLT' && project.build.distribution.bucketNameDlt) {
+            bucketName = project.build.distribution.bucketNameDlt;
+          }
+
+          if (envTarget === 'TRN' && project.build.distribution.bucketNameTrn) {
+            bucketName = project.build.distribution.bucketNameTrn;
+          }
+
+          if (envTarget === 'PROD' && project.build.distribution.bucketNameProd) {
+            bucketName = project.build.distribution.bucketNameProd;
+          }
+        }
       }
 
       // final output bucket location

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

@@ -68,9 +68,9 @@ const injectConfig = (project) => {
       }
     })
 
-    .then(() => {
-      return injectPackagesConfig(project);
-    })
+    // .then(() => {
+    //   return injectPackagesConfig(project);
+    // })
 
     .catch((e) => {
       throw e;
@@ -78,129 +78,129 @@ const injectConfig = (project) => {
 }
 
 
-const injectPackagesConfig = (project) => {
-  tools.logTitle('Injecting package config');
+// const injectPackagesConfig = (project) => {
+//   tools.logTitle('Injecting package config');
 
-  return Promise.resolve()
+//   return Promise.resolve()
 
-    // fetching current project linked composite packages dependencies
-    .then(() => {
-      return installUtils.common.getLocalProjectDeps(project);
-    })
+//     // fetching current project linked composite packages dependencies
+//     .then(() => {
+//       return installUtils.common.getLocalProjectDeps(project);
+//     })
 
 
-    // remapping dependencies with package names
-    .then((prjDeps) => {
+//     // remapping dependencies with package names
+//     .then((prjDeps) => {
 
-      // gather only the locally installed projects,
-      const localPackagesConfig = configUtils.packages.getPackages();
+//       // gather only the locally installed projects,
+//       const localPackagesConfig = configUtils.packages.getPackages();
 
-      let localPackagesArray = [];
+//       let localPackagesArray = [];
 
-      Object.keys(prjDeps).forEach((p) => {
-        const filteredPackage = localPackagesConfig.filter((fp) => {
-          // filtering from the current deps pkg
-          return fp.npmPkg === p;
-        })[0];
+//       Object.keys(prjDeps).forEach((p) => {
+//         const filteredPackage = localPackagesConfig.filter((fp) => {
+//           // filtering from the current deps pkg
+//           return fp.npmPkg === p;
+//         })[0];
 
-        if (filteredPackage) localPackagesArray.push(filteredPackage.name);
-      });
+//         if (filteredPackage) localPackagesArray.push(filteredPackage.name);
+//       });
 
 
 
-      // gather the full CSDR packages from project dependencies
-      const csdrPackagesConfig = configUtils.packages.getCsdrPackagesFull();
+//       // gather the full CSDR packages from project dependencies
+//       const csdrPackagesConfig = configUtils.packages.getCsdrPackagesFull();
 
-      let csdrPackagesArray = [];
+//       let csdrPackagesArray = [];
 
-      Object.keys(prjDeps).forEach((p) => {
-        const filteredPackage = csdrPackagesConfig.filter((fp) => {
-          // filtering from the current deps pkg; excluding the ones found locally
-          return fp.npmPkg === p && !localPackagesArray.includes(fp.name);
-        })[0];
+//       Object.keys(prjDeps).forEach((p) => {
+//         const filteredPackage = csdrPackagesConfig.filter((fp) => {
+//           // filtering from the current deps pkg; excluding the ones found locally
+//           return fp.npmPkg === p && !localPackagesArray.includes(fp.name);
+//         })[0];
 
-        if (filteredPackage) csdrPackagesArray.push(filteredPackage.npmPkg);
-      });
+//         if (filteredPackage) csdrPackagesArray.push(filteredPackage.npmPkg);
+//       });
 
 
-      return {
-        csdrPackages: csdrPackagesArray,
-        localPackages: localPackagesArray,
-      };
-    })
+//       return {
+//         csdrPackages: csdrPackagesArray,
+//         localPackages: localPackagesArray,
+//       };
+//     })
 
 
-    // checking filtered packages if config overrides is provided
-    .then((filteredPackages) => {
+//     // checking filtered packages if config overrides is provided
+//     .then((filteredPackages) => {
 
-      // checking installed packages
-      filteredPackages.csdrPackages.forEach((p) => {
-        const pkgPath = path.join(process.cwd(), 'node_modules', p);
-        processPackageConfig(project, pkgPath);
-      })
+//       // checking installed packages
+//       filteredPackages.csdrPackages.forEach((p) => {
+//         const pkgPath = path.join(process.cwd(), 'node_modules', p);
+//         processPackageConfig(project, pkgPath);
+//       })
 
-      // checking local packages
-      filteredPackages.localPackages.forEach((p) => {
-        const pkgPath = path.join(process.cwd(), 'packages', p);
-        processPackageConfig(project, pkgPath);
-      })
+//       // checking local packages
+//       filteredPackages.localPackages.forEach((p) => {
+//         const pkgPath = path.join(process.cwd(), 'packages', p);
+//         processPackageConfig(project, pkgPath);
+//       })
 
-    })
+//     })
 
 
-    .catch((e) => {
-      throw e;
-    })
-}
+//     .catch((e) => {
+//       throw e;
+//     })
+// }
 
-const processPackageConfig = (project, folder) => {
-    const configPath = path.join(folder, 'assets', 'config');
-    tools.logInfo(`checking ${configPath}`);
+// const processPackageConfig = (project, folder) => {
+//     const configPath = path.join(folder, 'assets', 'config');
+//     tools.logInfo(`checking ${configPath}`);
 
-    // checking if pkg contains overriden config
-    if (!tools.isDirExists(configPath)) {
-      tools.logWarning('not found...skipping');
+//     // checking if pkg contains overriden config
+//     if (!tools.isDirExists(configPath)) {
+//       tools.logWarning('not found...skipping');
 
-    // processing the files found and mapping them to base config files
-    } else {
-      const configFiles = tools.getFiles(configPath);
-      tools.logSuccess('OK, found config files : ');
-      console.log(configFiles);
+//     // processing the files found and mapping them to base config files
+//     } else {
+//       const configFiles = tools.getFiles(configPath);
+//       tools.logSuccess('OK, found config files : ');
+//       console.log(configFiles);
 
-      // checking if files maps the base config file
-      const projectAssetsPath = path.join(process.cwd(), project.folder, 'src', 'assets');
-      const baseConfigFiles = tools.getFiles(projectAssetsPath);
+//       // checking if files maps the base config file
+//       const projectAssetsPath = path.join(process.cwd(), project.folder, 'src', 'assets');
+//       const baseConfigFiles = tools.getFiles(projectAssetsPath);
 
-      configFiles.forEach((f) => {
-        if (!baseConfigFiles.includes(f)) {
-          tools.logWarning(`${f} is not matching base config files`);
+//       configFiles.forEach((f) => {
+//         if (!baseConfigFiles.includes(f)) {
+//           tools.logWarning(`${f} is not matching base config files`);
 
-        } else {
-          tools.logSuccess(`${f} matched in base config files...processing`);
+//         } else {
+//           tools.logSuccess(`${f} matched in base config files...processing`);
 
-          // fetching files content
-          const configFileContent = tools.getJsonFileContent(path.join(configPath, f));
-          const baseConfigFileContent = tools.getJsonFileContent(path.join(projectAssetsPath, f));
+//           // fetching files content
+//           const configFileContent = tools.getJsonFileContent(path.join(configPath, f));
+//           const baseConfigFileContent = tools.getJsonFileContent(path.join(projectAssetsPath, f));
 
-          baseConfigFileContent.openIdConnect.apiGatewayServices = {
-            ...baseConfigFileContent.openIdConnect.apiGatewayServices,
-            ...configFileContent.apiGatewayServices
-          };
+//           baseConfigFileContent.openIdConnect.apiGatewayServices = {
+//             ...baseConfigFileContent.openIdConnect.apiGatewayServices,
+//             ...configFileContent.apiGatewayServices
+//           };
 
-          baseConfigFileContent.modules = {
-            ...baseConfigFileContent.modules,
-            ...configFileContent.modules
-          };
+//           baseConfigFileContent.modules = {
+//             ...baseConfigFileContent.modules,
+//             ...configFileContent.modules
+//           };
 
-          tools.writeJsonFileSync(path.join(projectAssetsPath, f), baseConfigFileContent);
+//           tools.writeJsonFileSync(path.join(projectAssetsPath, f), baseConfigFileContent);
 
-          tools.logSuccess('OK => file processed');
-        }
+//           tools.logSuccess('OK => file processed');
+//         }
 
-      })
-    }
-}
+//       })
+//     }
+// }
 
 
 module.exports.injectConfig = injectConfig;
-module.exports.injectPackagesConfig = injectPackagesConfig;
+// module.exports.injectPackagesConfig = injectPackagesConfig;

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

@@ -110,8 +110,27 @@ module.exports.injectExternalAppSources = (project, build = false) => {
           return Promise.resolve()
             .then(() => {
               if (!build) {
-                tools.logInfo(`Removing ${projectSrcPath} content`);
-                return tools.rimraf(projectSrcPath);
+                // removing previously injected content, except assets
+                const projectSrcAppPath = path.join(projectSrcPath, 'app');
+                const projectSrcConfigPath = path.join(projectSrcPath, 'config');
+                const projectSrcEnvironmentsPath = path.join(projectSrcPath, 'environments');
+
+                return Promise.resolve()
+                  .then(() => {
+                    tools.logInfo(`Removing ${projectSrcAppPath} content`);
+                    return tools.rimraf(projectSrcAppPath);
+                  })
+                  .then(() => {
+                    tools.logInfo(`Removing ${projectSrcConfigPath} content`);
+                    return tools.rimraf(projectSrcConfigPath);
+                  })
+                  .then(() => {
+                    tools.logInfo(`Removing ${projectSrcEnvironmentsPath} content`);
+                    return tools.rimraf(projectSrcEnvironmentsPath);
+                  })
+                  .catch((e) => {
+                    throw e;
+                  })
               }
             })
             .then(() => {

package/scripts/utils/pre-build/projects.js

@@ -160,6 +160,9 @@ module.exports.injectAppConfig = (project, configEnvTarget) => {
         envFilePath = path.join(project.paths.angularPath, 'src/assets/config', `env-json-config-${configEnvTarget}.json`);
       }
 
+      if (project.build && project.build.customEnvJsonConfigInjection) {
+        return;
+      }
       if (!tools.isFileExists(envFilePath)) {
         tools.logError(`Cannot find environment config to inject : `);
         tools.logError(`${envFilePath} missing...`);