@eui/tools 5.3.21 → 5.3.24

package/.version.properties

@@ -1 +1 @@
-5.3.21
+5.3.24

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 5.3.24 (2022-06-21)
+
+##### Bug Fixes
+
+* **other:**
+  * prevent cleaning injected sources at build time - MWP-7700 [MWP-7700](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7700)  ([edda50d6](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/edda50d6d28c3760af0903ed55a9354f7e994bfd))
+
+* * *
+* * *
+## 5.3.23 (2022-06-21)
+
+##### Chores
+
+* **other:**
+  * force optimized build for MWP host on all environment option - MWP-7700 [MWP-7700](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7700)  ([c7f092c2](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/c7f092c2abf242932f456f35ebc0d8ee1529d3bb))
+
+* * *
+* * *
+## 5.3.22 (2022-06-21)
+
+##### Chores
+
+* **other:**
+  * adapted routes replacement for local csdr app build - MWP-7700 [MWP-7700](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7700)  ([cd35684e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/cd35684e3489edc411c52caf4d874fc660710274))
+
+* * *
+* * *
 ## 5.3.21 (2022-06-21)
 
 ##### Bug Fixes

package/package.json

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

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

@@ -165,6 +165,10 @@ module.exports.angular = (envTarget, isSnapshot, version, configEnvTargetIn) =>
           isOptimizedBuild = true;
         }
 
+        if (currentProject.build.fullOptimizedBuild) {
+          isOptimizedBuild = true;
+        }
+
         if (!envTarget && isSnapshot && currentProject.build && currentProject.build.snapshotBuildOptimized) {
           isOptimizedBuild = true;
         }

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

@@ -64,7 +64,7 @@ module.exports.injectExternalFeatures = (project) => {
 }
 
 
-module.exports.injectExternalAppSources = (project) => {
+module.exports.injectExternalAppSources = (project, build = false) => {
 
   tools.logTitle(`Injecting project external application sources for : ${project.name}`);
 
@@ -106,11 +106,13 @@ module.exports.injectExternalAppSources = (project) => {
           throw new Error('External features not found');
 
         } else {
-          tools.logInfo(`Removing ${projectSrcPath} content`);
 
           return Promise.resolve()
             .then(() => {
-              return tools.rimraf(projectSrcPath);
+              if (!build) {
+                tools.logInfo(`Removing ${projectSrcPath} content`);
+                return tools.rimraf(projectSrcPath);
+              }
             })
             .then(() => {
               tools.logInfo(`${appSourcesSrcPath} injecting in ${projectSrcPath}`);

package/scripts/utils/pre-build/injection/routes-replacement.js

@@ -7,12 +7,20 @@ const tools = require('../../tools');
 const configUtils = require('../../../csdr/config/config-utils');
 
 
-const getEnvTarget = (envTarget, build) => {
-  if (!envTarget) {
-    throw 'ENV_TARGET_NOT_FOUND';
+const getEnvTarget = (envTargetIn, build) => {
+  if (!envTargetIn) {
+
+    // check if envTarget has been provided as cli args for stand-alone local build of CSDR apps
+    const { envTarget } = tools.getArgs();
+
+    if (!envTarget) {
+      throw 'ENV_TARGET_NOT_FOUND';
+    } else {
+      envTargetIn = envTarget;
+    }
   }
 
-  let envTargetFinal = envTarget.toLowerCase();
+  let envTargetFinal = envTargetIn.toLowerCase();
 
   if (build) {
     // dirty fix as openid files do not respect envTarget names
@@ -22,8 +30,8 @@ const getEnvTarget = (envTarget, build) => {
 
   // serve configuration based
   } else {
-    if (envTarget.indexOf('local') > -1) {
-      envTargetFinal = envTarget.replace('-openid', '');
+    if (envTargetIn.indexOf('local') > -1) {
+      envTargetFinal = envTargetIn.replace('-openid', '');
     } else {
       envTargetFinal = 'local-' + envTargetFinal;
     }

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

@@ -29,7 +29,7 @@ module.exports.preBuild = (project, envTarget, build, configEnvTarget) => {
     // inject external app sources declaration
     .then(() => {
       if (project.appSources && project.appSources.external) {
-        return injectionUtils.externals.injectExternalAppSources(project);
+        return injectionUtils.externals.injectExternalAppSources(project, build);
       }
     })