@eui/tools 6.3.16 → 6.3.18

package/.version.properties

@@ -1 +1 @@
-6.3.16
+6.3.18

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.3.18 (2023-02-06)
+
+##### Bug Fixes
+
+* **other:**
+  * wrong function call - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([79ee451a](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/79ee451adedd0ed360757061ea79dee90fb6ade4))
+
+* * *
+* * *
+## 6.3.17 (2023-02-06)
+
+##### Chores
+
+* **other:**
+  * added custom env script injection for MWP CDN - EUI-7035 [EUI-7035](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7035)  ([b38f15fb](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/b38f15fb3c89f29065280d9b4d165cf27d8a258b))
+
+* * *
+* * *
 ## 6.3.16 (2023-02-02)
 
 ##### Bug Fixes

package/package.json

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

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

@@ -329,33 +329,13 @@ module.exports.generateProjectDistributionFile = (project, isSnapshot, envTarget
           bucketName = project.build.distribution.bucketNameSnapshot;
         }
 
+        // if bucket has been defined for specific envTarget
         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;
+          if (project.build.distribution.envs) {
+            const envBucketName = project.build.distribution.envs[envTarget.toLowerCase()];
+            if (envBucketName) {
+              bucketName = envBucketName;
+            }
           }
         }
       }

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

@@ -126,10 +126,22 @@ module.exports.preBuild = (project, envTarget, build, configEnvTarget) => {
         }
         tools.logSuccess();
       }
+    })
+
 
+    // injection config based on configEnvTarget (for openid files replacement)
+    .then(() => {
       return this.injectAppConfig(project, configEnvTarget);
     })
 
+
+    // processing custom script injection if enabled in project config
+    .then(() => {
+      return this.processCustomEnvScriptInjection(project, envTarget);
+    })
+
+
+    // checking if project as own pre-build.js script defined, and executing it
     .then(() => {
       const prebuildScript = path.join(project.paths.rootPath, 'pre-build.js');
 
@@ -149,7 +161,6 @@ module.exports.preBuild = (project, envTarget, build, configEnvTarget) => {
 }
 
 
-
 module.exports.injectAppConfig = (project, configEnvTarget) => {
   return Promise.resolve()
     .then(() => {
@@ -200,6 +211,43 @@ module.exports.injectAppConfig = (project, configEnvTarget) => {
 }
 
 
+module.exports.processCustomEnvScriptInjection = (project, envTarget) => {
+  return Promise.resolve()
+    .then(() => {
+      if (project.build && project.build.customEnvScriptInjection) {
+        tools.logInfo(`Processing custom script injection for ${project.name} - envTarget: ${envTarget}`);
+
+        const scriptName = project.build.customEnvScriptInjection[(envTarget.toLowerCase())];
+        if (!scriptName) {
+          tools.logWarning('Unable to find script replacement definition for envTarget...skipping');
+          return;
+
+        } else {
+          tools.logInfo(`Script to replace : ${scriptName}`);
+          const injectedScript = `<script type="text/javascript" src="${scriptName}" crossorigin="anonymous"></script>`;
+          const placeholderToReplace = '<!-- CUSTOM SCRIPT INJECTION PLACEHOLDER -->';
+          const fileToReplace = path.join(project.paths.angularPath, 'src', 'index.html');
+
+          if (tools.isFileExists(fileToReplace)) {
+            return tools.replaceInFile(
+              fileToReplace,
+              placeholderToReplace,
+              injectedScript
+            );
+
+          } else {
+            tools.logWarning(`Source replacement file does not exist : ${fileToReplace}`);
+          }
+        }
+      }
+    })
+
+    .catch((e) => {
+      throw e;
+    })
+}
+
+
 module.exports.processSvgAssets = (project) => {
   return Promise.resolve()
     .then(() => {