@eui/tools 5.3.26 → 5.3.27

package/.version.properties

@@ -1 +1 @@
-5.3.26
+5.3.27

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 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

package/package.json

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

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/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...`);