@eui/tools 6.15.19 → 6.15.21

package/.version.properties

@@ -1 +1 @@
-6.15.19
+6.15.21

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.15.21 (2024-03-05)
+
+##### Reverts
+
+* **other:**
+  * collide with MWP strategy - EUI-8994 [EUI-8994](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-8994)  ([ec61e0fa](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/ec61e0fa6f6833fd9758e1a0c5a20c5c482ee74f))
+
+* * *
+* * *
+## 6.15.20 (2024-03-05)
+
+##### Chores
+
+* **other:**
+  * adapted customScripInjection for MWP CDN / dynatrace script - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([c0b7d975](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/c0b7d975d408fb96829bdaf9cd8a8bcab130ee2b))
+
+* * *
+* * *
 ## 6.15.19 (2024-03-05)
 
 ##### Chores

package/package.json

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

package/scripts/csdr/version/package-common.js

@@ -20,7 +20,7 @@ const writePackageJsonCore = (newVersion, folder, isSnapshot, isNextBranch, isSu
       let tag = 'latest';
 
       if (isSnapshot) {
-        tag = `v${newVersion.split('.')[0]}-snapshot`;
+        tag = `snapshot`;
       } else if (isNextBranch) {
         tag = 'next';
       } else if (isSupportBranch) {

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

@@ -104,7 +104,7 @@ module.exports.preBuild = (project, envTarget, build, configEnvTarget) => {
 
     // processing custom script injection if enabled in project config
     .then(() => {
-      return this.processCustomEnvScriptInjection(project, envTarget);
+      return this.processCustomEnvScriptInjection(project, envTarget, configEnvTarget);
     })
 
     // checking if project as own pre-build.js script defined, and executing it
@@ -126,15 +126,23 @@ module.exports.preBuild = (project, envTarget, build, configEnvTarget) => {
 };
 
 
-module.exports.processCustomEnvScriptInjection = (project, envTarget) => {
+module.exports.processCustomEnvScriptInjection = (project, envTarget, configEnvTarget) => {
   return Promise.resolve()
     .then(() => {
       if (project.build && project.build.customEnvScriptInjection) {
-        tools.logInfo(`Processing custom script injection for ${project.name} - envTarget: ${envTarget}`);
+        let envTargetGen;
 
-        const scriptName = project.build.customEnvScriptInjection[envTarget.toLowerCase()];
+        if (project.build && project.build.customEnvScriptInjectionConfigEnvTarget) {
+          envTargetGen = configEnvTarget;
+          tools.logInfo(`Processing custom script injection for ${project.name} - configEnvTarget: ${envTargetGen}`);
+        } else {
+          envTargetGen = envTarget;
+          tools.logInfo(`Processing custom script injection for ${project.name} - envTarget: ${envTargetGen}`);
+        }
+
+        const scriptName = project.build.customEnvScriptInjection[envTargetGen.toLowerCase()];
         if (!scriptName) {
-          tools.logWarning('Unable to find script replacement definition for envTarget...skipping');
+          tools.logWarning('Unable to find script replacement definition for envTarget/configEnvTarget...skipping');
           return;
         } else {
           tools.logInfo(`Script to replace : ${scriptName}`);