@eui/tools 5.3.22 → 5.3.25

package/.version.properties

@@ -1 +1 @@
-5.3.22
+5.3.25

package/CHANGELOG.md

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

package/package.json

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

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

@@ -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;
         }
@@ -266,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;
@@ -294,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/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,32 @@ 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) {
+                // 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(() => {
               tools.logInfo(`${appSourcesSrcPath} injecting in ${projectSrcPath}`);

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);
       }
     })